Mercurial > hg
changeset 7739:edcb56991afe
merge with mpm
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Sat, 07 Feb 2009 23:29:12 +0100 |
| parents | db366ec8d0a4 (diff) 9f73bddb9d0b (current diff) |
| children | 176d3d681702 |
| files | mercurial/commands.py mercurial/patch.py |
| diffstat | 4 files changed, 15 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/hgk Thu Dec 25 10:42:01 2008 +0100 +++ b/contrib/hgk Sat Feb 07 23:29:12 2009 +0100 @@ -439,7 +439,7 @@ global entries sha1entry sha1string sha1but global maincursor textcursor curtextcursor global rowctxmenu gaudydiff mergemax - global hgvdiff + global hgvdiff bgcolor menu .bar .bar add cascade -label "File" -menu .bar.file @@ -478,16 +478,16 @@ .ctop add .ctop.top set canv .ctop.top.clist.canv canvas $canv -height $geometry(canvh) -width $geometry(canv1) \ - -bg white -bd 0 \ + -bg $bgcolor -bd 0 \ -yscrollincr $linespc -yscrollcommand "$cscroll set" -selectbackground grey .ctop.top.clist add $canv set canv2 .ctop.top.clist.canv2 canvas $canv2 -height $geometry(canvh) -width $geometry(canv2) \ - -bg white -bd 0 -yscrollincr $linespc -selectbackground grey + -bg $bgcolor -bd 0 -yscrollincr $linespc -selectbackground grey .ctop.top.clist add $canv2 set canv3 .ctop.top.clist.canv3 canvas $canv3 -height $geometry(canvh) -width $geometry(canv3) \ - -bg white -bd 0 -yscrollincr $linespc -selectbackground grey + -bg $bgcolor -bd 0 -yscrollincr $linespc -selectbackground grey .ctop.top.clist add $canv3 bind .ctop.top.clist <Configure> {resizeclistpanes %W %w} @@ -547,7 +547,7 @@ .ctop add .ctop.cdet frame .ctop.cdet.left set ctext .ctop.cdet.left.ctext - text $ctext -bg white -state disabled -font $textfont \ + text $ctext -bg $bgcolor -state disabled -font $textfont \ -width $geometry(ctextw) -height $geometry(ctexth) \ -yscrollcommand ".ctop.cdet.left.sb set" \ -xscrollcommand ".ctop.cdet.left.hb set" -wrap none @@ -581,7 +581,7 @@ frame .ctop.cdet.right set cflist .ctop.cdet.right.cfiles - listbox $cflist -bg white -selectmode extended -width $geometry(cflistw) \ + listbox $cflist -bg $bgcolor -selectmode extended -width $geometry(cflistw) \ -yscrollcommand ".ctop.cdet.right.sb set" scrollbar .ctop.cdet.right.sb -command "$cflist yview" pack .ctop.cdet.right.sb -side right -fill y @@ -679,7 +679,7 @@ proc savestuff {w} { global canv canv2 canv3 ctext cflist mainfont textfont global stuffsaved findmergefiles gaudydiff maxgraphpct - global maxwidth authorcolors curidfont + global maxwidth authorcolors curidfont bgcolor if {$stuffsaved} return if {![winfo viewable .]} return @@ -721,6 +721,7 @@ puts $f "# the last entry will be reused." puts $f "#" puts $f "set authorcolors {$authorcolors}" + puts $f "set bgcolor $bgcolor" close $f file rename -force "~/.hgk-new" "~/.hgk" } @@ -3891,6 +3892,7 @@ set authorcolors { black blue deeppink mediumorchid blue burlywood4 goldenrod slateblue red2 navy dimgrey } +set bgcolor white catch {source ~/.hgk}
--- a/hgext/convert/__init__.py Thu Dec 25 10:42:01 2008 +0100 +++ b/hgext/convert/__init__.py Sat Feb 07 23:29:12 2009 +0100 @@ -227,7 +227,7 @@ ('', 'parents', '', _('show parent changesets')), ('', 'ancestors', '', _('show current changeset in ancestor branches')), # Options that are ignored for compatibility with cvsps-2.1 - ('A', 'cvs-direct', None, 'ignored for compatibility'), + ('A', 'cvs-direct', None, _('ignored for compatibility')), ], - 'hg debugcvsps [OPTION]... [PATH]...'), + _('hg debugcvsps [OPTION]... [PATH]...')), }
--- a/mercurial/commands.py Thu Dec 25 10:42:01 2008 +0100 +++ b/mercurial/commands.py Sat Feb 07 23:29:12 2009 +0100 @@ -838,7 +838,7 @@ def debugindex(ui, file_): """dump the contents of an index file""" r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_) - ui.write(" rev offset length base linkrev" + + ui.write(" rev offset length base linkrev" " nodeid p1 p2\n") for i in r: node = r.node(i)
--- a/mercurial/patch.py Thu Dec 25 10:42:01 2008 +0100 +++ b/mercurial/patch.py Sat Feb 07 23:29:12 2009 +0100 @@ -52,9 +52,9 @@ # attempt to detect the start of a patch # (this heuristic is borrowed from quilt) - diffre = re.compile(r'^(?:Index:[ \t]|diff[ \t]|RCS file: |' + - 'retrieving revision [0-9]+(\.[0-9]+)*$|' + - '(---|\*\*\*)[ \t])', re.MULTILINE) + diffre = re.compile(r'^(?:Index:[ \t]|diff[ \t]|RCS file: |' + r'retrieving revision [0-9]+(\.[0-9]+)*$|' + r'(---|\*\*\*)[ \t])', re.MULTILINE) fd, tmpname = tempfile.mkstemp(prefix='hg-patch-') tmpfp = os.fdopen(fd, 'w')