Ticket #2126 (closed enhancement: fixed)

Opened 9 years ago

Last modified 9 years ago

ini.syntax

Reported by: zaytsev Owned by: zaytsev
Priority: trivial Milestone: 4.7.2
Component: mcedit Version: master
Keywords: Cc:
Blocked By: Blocking:
Branch state: Votes for changeset: committed-master committed-stable

Description (last modified by andrew_b) (diff)

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=567046

From: Karsten Hilbert <karsten.hilbert@gmx.net>
To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: mc: INI syntax file proposition
Date: Tue, 26 Jan 2010 22:49:38 +0100
[Message part 1 (text/plain, inline)]
Package: mc
Version: 3:4.7.0.1-1
Severity: wishlist
Tags: patch
I am attaching a proposed syntax highlighting definition for
- gasp - DOS style INI files. You,
	[groups]
with
	option = value
and such. It would probably need to be tied to *.ini files.
Personally I also use it for *.conf files but that is by no
means safe to assume to be an INI style file.
I'd love to set the
	option
part in
	option = value
to some other color, too, but didn't find the proper syntax
for that.
Karsten

Attachments

ini.syntax (215 bytes) - added by zaytsev 9 years ago.

Change History

Changed 9 years ago by zaytsev

comment:1 Changed 9 years ago by zaytsev

  • severity changed from no branch to on review

Branch: 2126_ini_syntax (parent: master)
Changeset: f25d1fbd2f53bcc618691be33022650b82ddce73

comment:2 Changed 9 years ago by andrew_b

  • Owner set to zaytsev
  • Status changed from new to assigned
  • Votes for changeset set to andrew_b

comment:3 Changed 9 years ago by zaytsev

Could someone clever please tell me how to set option = value to some other color as per original request? I'd be happy to apply the patch and squash the branch.

comment:4 Changed 9 years ago by slavazanko

  • Votes for changeset changed from andrew_b to andrew_b slavazanko
  • severity changed from on review to approved

comment:5 Changed 9 years ago by zaytsev

Did anyone see my question above about highlighting of the first part? I have no clue how to implement this correctly, but if someone comes up with the solution after merge I'll have to reopen and merge again for just few lines... Egh?

comment:6 Changed 9 years ago by slavazanko

See changeset:a25431452305fdc471bcccd3bdbcbe9b5965113f

Also, no need to create separate branch (and tickect) for syntax-highlight related patches: http://midnight-commander.org/wiki/WorkingGuideLines#Directcommits

comment:7 Changed 9 years ago by zaytsev

  • Status changed from assigned to accepted

Hi Slava!

Looks cool! Shall I merge this or you want to use this branch for something else? Sorry for creating the branch, I'm out of Jabber till at least next week. I would have asked there otherwise.

Z.

comment:8 Changed 9 years ago by slavazanko

Shall I merge this or you want to use this branch for something else?

Just merge.

comment:9 Changed 9 years ago by zaytsev

  • Status changed from accepted to testing
  • Votes for changeset changed from andrew_b slavazanko to committed-master committed-stable
  • Resolution set to fixed
  • severity changed from approved to merged

Committed to master. Merge changeset: bfd0b2c9953dfa5a0591ee243a1532ad44138463.
Cherry-picked to 4.7.0-stable, changeset: 03fdddfdccfa6eba501b66da208db032bdb44572.

comment:10 Changed 9 years ago by zaytsev

  • Status changed from testing to closed

comment:11 Changed 9 years ago by andrew_b

  • Description modified (diff)

Don't forget remove the merged branch.

comment:12 Changed 9 years ago by zaytsev

Actually, I can't:

zyv@mypride:~/Documents/test/mc-git$ git push origin :2149_patchfs_single_line
error: unable to push to unqualified destination: 2149_patchfs_single_line
The destination refspec neither matches an existing ref on the remote nor
begins with refs/, and we are unable to guess a prefix based on the source ref.
error: failed to push some refs to 'ssh+git://midnight-commander.org/git/mc.git'

zyv@mypride:~/Documents/test/mc-git$ git push origin :refs/origin/2149_patchfs_single_line
warning: Allowing deletion of corrupt ref.
*** Unknown type of update to refs/origin/2149_patchfs_single_line ()
***  - no email generated
error: hooks/post-receive exited with error code 1
To ssh+git://midnight-commander.org/git/mc.git
 - [deleted]         refs/origin/2149_patchfs_single_line

zyv@mypride:~/Documents/test/mc-git$ git branch -r
  origin/2149_patchfs_single_line

I use the latest git FYI.

comment:13 Changed 9 years ago by slavazanko

$ git pull
Already up-to-date.
$ git branch -r | grep -c 2149
0

Looks as your local problems. Check your loal copy of repo.

also, run:

git remote prune origin

for cleanup of removed branches.

comment:14 Changed 9 years ago by slavazanko

and why you looking at '2149_patchfs_single_line' branch? Is this branch is actial for this ticket? :)

comment:15 Changed 9 years ago by zaytsev

Thanks! The pruning thing fixed the issue for me. I couldn't delete this one, so I tried another one which I know was already merged.

Note: See TracTickets for help on using tickets.