Commit Graph

422 Commits

Author SHA1 Message Date
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
Adam Spiers
628e7b3fec buildrpm: fix rpm release number calculation
It was broken when patch queues were in use.
2007-06-30 01:21:41 +01:00
Lee Cantey
bcfa3d34a8 Convert default mercurial.ini file to Windows line endings 2007-06-29 13:06:49 -07:00
Bryan O'Sullivan
753061d492 Update binary installer files. 2007-06-25 16:35:27 -07:00
Adam Spiers
84fdb1c81b buildrpm: auto-generate %changelog in .spec file
Top entry is tip; subsequent entries are the version tags from .hgtags.
2007-06-03 14:42:39 +01:00
Adam Spiers
befe0e3cb2 mercurial.spec: include CONTRIBUTORS, COPYING and man pages in rpm 2007-06-30 01:21:22 +01:00
Adam Spiers
34346718e5 mercurial.spec: include various utility files from contrib/ in rpm
Files included:
hgk
convert-repo
hg-ssh
hg-viz
git-rev-tree
bash_completion
zsh_completion
mercurial.el
2007-06-03 14:40:56 +01:00
NIIMI Satoshi
ad08d10949 mercurial.el: ignore errors on hg-after-save-hook()
Don't signal an error even if running hg command fails.  Otherwise,
succeeding hooks won't be called.
2007-05-22 07:24:06 +09:00
NIIMI Satoshi
2d751dee3c mercurial.el: change default log range to tip:0
If the tip revision is smaller than hg-rev-completion-limit (defaults
to 100), "hg log -r tip:-100" fails.

Since performance does not differ between "hg log -l 50 -r tip:0" and
"hg log -l 50 -r tip:-100" even on large repository, default range can
be changed from "tip:-100" to "tip:0" without any drawbacks.
2007-05-22 08:05:16 +09:00
Thomas Arendsen Hein
9270e4454c hgk: Use $HG instead of hg (see 9779a8c8d672) 2007-06-23 21:10:55 +02:00
Thomas Arendsen Hein
4d29c6dc8e Updated copyright notices and add "and others" to "hg version" 2007-06-19 08:51:34 +02:00
Lee Cantey
dd5e7d8612 Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer.
Initial version from Shun-ichi GOTO in BTS 449 for private copies of DLLs.
Additional changes to remove local DLL flag on uninstall and set privilege level.
2007-06-18 15:21:02 -07:00
Edouard Gomez
dbf0694f1f Add a wrapper script for convert extension 2007-05-25 08:12:33 +02:00
Thomas Arendsen Hein
ae50302e53 Move convert-repo to hgext/convert/__init__.py 2007-06-06 19:49:47 +02:00
Patrick Mezard
fe805595f1 Merge with crew-stable 2007-06-04 22:56:42 +02:00