Matt Mackall
1de0ed9a08
Merge with stable
2007-12-18 15:17:11 -06:00
Lee Cantey
4f90d32027
Default to 10.5 version using the default python 2.5
2007-12-10 14:54:41 -08:00
Steve Borho
957c67ad44
hgk: add black and blue as preferred colors
2007-12-10 12:16:59 -06:00
Steve Borho
90a5a885a9
win32: remove text man pages from Windows package
...
The HTML versions are still packaged, and do not suffer from
eoln problems. This solves issue531 (addition through subtraction)
2007-12-08 13:18:03 -06:00
Bryan O'Sullivan
58767a2b81
Merge with mpm
2007-12-07 21:46:08 -08:00
Steve Borho
2f5f0c75a9
win32: include zsh_completion in Windows package
2007-12-07 18:19:16 -06:00
Steve Borho
b092b562f9
win32: include contrib/vim in Windows package
2007-12-07 18:19:16 -06:00
Steve Borho
84bda28dba
win32: use relative path to install source
...
Remove hard-coded path to the source repo to be packaged.
2007-12-07 18:19:16 -06:00
Steve Borho
a380954518
win32: move default install path inside program files
...
All of the 'space in path' problems have been resolved, so
we can install Mercurial the Windows standard location. The
{pf} InnoSetup variable is locale aware.
2007-12-07 18:19:01 -06:00
Steve Borho
ae1da92108
win32: it is no longer necessary to bundle patch.exe
...
Mercurial can use it's built-in mpatch library
2007-12-07 18:18:11 -06:00
Matt Mackall
7d8a71a539
churn: avoid division by zero
2007-12-02 17:04:16 -06:00
Peter Arrenbrecht
bfb3ae9d06
Support qgoto in contrib/bash_completion.
2007-11-05 08:41:22 +01:00
bdowning@lavos.net
95bc1b9c93
hgk: change config file from .gitk to .hgk
...
Git's gitk and Mercurial's hgk have diverged enough that their configuration information is no longer entirely compatible. Whenever I run one, the other gets reset to the default screen position. This patch changes hgk to store and read its configuration from ".hgk" instead of ".gitk", so as not to conflict with the "real" gitk anymore.
2007-11-03 21:50:11 +01:00
Dustin Sallings
bebcdac954
Use both the from and to name in mdiff.unidiff.
...
This fixes a compatibility issue with git diffs.
* * *
2007-11-01 12:17:59 -07:00
NIIMI Satoshi
5043b722ca
mq.el: define keymaps as convensions
2007-10-11 06:13:17 +09:00
NIIMI Satoshi
33f14d7efe
mercurial.el: mark-marker() returns non-nil with no active mark on GNU Emacs
2007-10-11 06:10:45 +09:00
NIIMI Satoshi
d6fe209c49
mq.el: declare variable mq-top
2007-10-11 06:01:30 +09:00
NIIMI Satoshi
471e00333a
mercurial.el, mq.el: remove runtime dependencies on CL package
...
* (require 'cl) at compile-time
* don't use map()
2007-10-11 05:58:54 +09:00
Georg.Koltermann@mscsoftware.com
0e65b396d5
hgk: colorize commits by authors
...
Color commits by author. Colors will be assigned to authors by using a configurable list of colors. The line corresponding to current id (the version currently in the working tree) is highlighted in a special font which is also configurable. There is provision to assign fixed colors to authors. See .gitk comment for details.
2007-04-12 13:11:30 +02:00
Christian Ebert
efbbc0df82
churn: simplify code to get terminal width
2007-09-12 12:54:36 +02:00
TK Soh
630bf5e215
hgk: allow any extdiff command for visual diff
2007-10-08 11:18:34 +08:00
Patrick Mezard
0e612978e0
hgk: add basic usage and configuration documentation
2007-10-05 23:40:33 +02:00
Patrick Mezard
8dbf0b280f
hgk: add context menu visual diff action
...
* * *
2007-10-02 23:28:04 +02:00
Patrick Mezard
510efc6c01
hgk: add debug-config command to pass configuration options
2007-10-05 22:39:36 +02:00
Patrick Mezard
671b107790
hgk: fix right-mouse button handling under macosx
2007-10-02 23:28:02 +02:00
Bryan O'Sullivan
ecdd764817
convert: support darcs as a source repo
2007-10-02 13:49:11 -07:00
Bryan O'Sullivan
cf0914fc76
Merge with crew.
2007-09-29 20:55:36 -07:00
Brendan Cully
04f2479b21
Updated zsh completion from issue722.
2007-09-14 21:47:40 -07:00
Terry Smith
48df6ab798
darcs2hg: Added support for darcs tags.
2007-09-11 13:30:37 -04:00
Terry Smith
1189358bfb
darcs2hg: Now detects and recovers from simple darcs conflicts.
2007-09-11 13:13:54 -04:00
Terry Smith
93e0edd2dc
darcs2hg: Now understands files that were explicitly renamed in darcs.
2007-09-11 12:42:52 -04:00
Steve Borho
5a6d8a2860
hgk: add repo root to window title
2007-09-05 21:53:59 +02:00
Benoit Boissinot
6addb45a89
cgi: sys.path.insert should be before importing mercurial
...
thanks to R. Burke
2007-08-25 16:31:37 +02:00
Thomas Arendsen Hein
90d76a6ec9
Enable demandimport only in scripts, not in importable modules (issue605)
...
This way other applications can choose if and when they want this feature,
because it might be problematic if those applications rely on ImportError.
2007-08-18 11:37:08 +02:00
Thomas Arendsen Hein
3574aa1bb0
Adjust contrib/hg-ssh for moved dispatch() function.
2007-08-17 19:11:16 +02:00
Thomas Arendsen Hein
e34927453f
Remove trailing spaces, fix indentation
2007-08-07 10:28:43 +02:00
Thomas Arendsen Hein
a799589be4
merge with crew-stable
2007-08-07 10:28:14 +02:00
Thomas Arendsen Hein
001b7980f8
Remove trailing spaces
2007-08-07 10:24:33 +02:00
Patrick Mezard
475f65528e
hgk: enable mouse wheel under Windows.
...
For some reason, MouseWheel events are not routed under windows even in latest ActiveTcl 8.4.15 while they are under linux and macosx. These events are activated using code supplied with Tcl Tip 171: <http://www.tcl.tk/cgi-bin/tct/tip/171.html >. Strangely, the Tip code almost work but generates some unexpected infinite loop which is fixed using a simple boolean to check reentrancy.
2007-07-22 16:21:49 +02:00
Patrick Mezard
20a41666e1
hgk: enable mouse wheel on MouseWheel events.
...
At this point, mouse wheel still does not work under Windows.
2007-07-22 16:21:49 +02:00
Christian Ebert
614aa178a1
churn: get current terminal width if possible
2007-07-19 18:39:51 +02:00
jon.christopher@Rigaku.com
db9543cd23
Re: mercurial.el and hg-version-other-window
...
hg-version-other window is unimplemented in mercurial.el. The version
below works for me, YMMV.
2007-07-14 11:27:58 -05:00
Thomas Arendsen Hein
e7f3af8440
merge with crew-stable
2007-07-06 08:55:36 +02:00
Lee Cantey
b7b57a0fbc
Add html docs and use for help shortcut
2007-07-05 15:40:29 -07:00
Lee Cantey
d44c55c0f5
Remove specific version requirement and point to latest versions of Mac Python downloads.
2007-07-03 04:18:24 -07:00
Thomas Arendsen Hein
ab2d8805b8
Merge with crew-stable
2007-07-01 19:19:42 +02:00
Thomas Arendsen Hein
34b7fe0900
Make hgk handle filenames with spaces (issue49)
2007-07-01 19:15:25 +02:00
Thomas Arendsen Hein
03bf1f420d
Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523.
...
tcl's exec yields an error if output to stderr happens and isn't redirected to
a file, so the warnings about untrusted .hg/hgrc caused problems in hgk.
The warning is still printed when executing 'hg view', so the user can see it
when using it from the shell.
2007-07-01 15:22:49 +02:00
Brendan Cully
f1750b4537
Merge with Adam Spiers
2007-06-30 08:31:23 -07:00
Adam Spiers
53cdf9de29
mercurial.spec: convert extension now installs files into hgext/convert/
2007-06-30 01:21:41 +01:00
