Benoit Boissinot
d80added47
merge with brendan
2006-08-30 19:58:54 +02:00
Brendan Cully
b733859249
Call patch.diff directly instead of printdiff - this also saves an
...
extra walk of the working directory.
2006-08-29 17:08:55 -07:00
Brendan Cully
619c7dab4b
Remove dates from git export file lines - they confuse git-apply
2006-08-29 17:08:42 -07:00
Benoit Boissinot
8e44aaf0dd
Document the fact that revert might overwrite .orig files
2006-08-29 19:26:58 +02:00
Benoit Boissinot
f3c38aa003
Add a hint for revert --all when aborting
2006-08-29 19:02:57 +02:00
Benoit Boissinot
5e11bd63c0
fix incorrect warning when walking on a particular rev
...
when a directory was given instead of a file it reported
incorrectly 'No such file or directory in rev <rev>'
we test if the file is a prefix directory
2006-08-28 21:49:02 +02:00
Benoit Boissinot
36b97cfba0
fix errors reported by pychecker
...
mercurial/merge.py:174: No global (mode) found
mercurial/merge.py:253: No global (errno) found
2006-08-26 11:19:00 +02:00
Alexis S. L. Carvalho
7831cbb9a7
Fixed an exception in notify extension (b2a_hex argument incorrect)
...
Detailed messages was - incoming.notify hook raised an exception: b2a_hex() argument 1 must be string or read-only character buffer, not stringio
2006-08-24 15:19:56 -07:00
TK Soh
e0b0dc515c
minor docstring fix for revert
2006-08-22 12:20:24 -05:00
Lee Cantey
3f812d11f2
Allow for MB/sec transfer rates in test-http-proxy and test-ssh.
...
Also make the test more specific in test-http.
2006-08-21 10:46:58 -07:00
Alexis S. L. Carvalho
16c4d42a8d
load extensions only after the ui object has been completely initialized
...
This fixes a traceback printed when hg tries to print another traceback
after an extension fails to be loaded. Add a test for that.
2006-08-22 22:49:30 -03:00
Alexis S. L. Carvalho
fa133e9e4f
Only read .hg/hgrc files from trusted users/groups
...
The list of trusted users and groups is specified in the [trusted]
section of a hgrc; the current user is always trusted; "*" can be
used to trust all users/groups.
Global hgrc files are always read.
On Windows (and other systems that don't have the pwd and grp modules),
all .hg/hgrc files are read.
2006-08-22 20:45:03 -03:00
Edouard Gomez
8d7e46a614
Fix hgk extension due to ce444c810fcf refactoring
2006-08-23 00:19:24 +02:00
Vadim Gelfer
9e5bd16634
merge.
2006-08-23 08:42:21 -07:00
Matt Mackall
877cbe24e7
merge: add remove to the action hash
2006-08-22 19:12:09 -05:00
Bryan O'Sullivan
f820deb822
mq.el: Add comment to mq-edit-finish.
2006-08-22 17:01:24 -07:00
Bryan O'Sullivan
ddd87b1304
mq.el: add ability to edit a patch.
2006-08-22 16:59:22 -07:00
Bryan O'Sullivan
c48ecf0092
qheader: exit withh meaningful error code.
2006-08-22 16:59:09 -07:00
Matt Mackall
b3f3e7896e
merge: combine merge and get lists
2006-08-22 18:06:17 -05:00
Bryan O'Sullivan
c1a8703aae
Emacs: add mq.el, early support for Mercurial Queues.
2006-08-22 16:04:58 -07:00
Bryan O'Sullivan
5a2ca1b7f7
MQ: Make more commands return meaningful errors.
2006-08-22 16:03:55 -07:00
Matt Mackall
97bb8b2e5a
merge: remove redundant if
2006-08-22 17:42:55 -05:00
Matt Mackall
849cf59e94
merge: eliminate mw manifestdict, do everything with m1
2006-08-22 17:26:44 -05:00
Matt Mackall
8ae551b4fc
merge: eliminate usage of m1 after working manifest creation
2006-08-22 17:20:09 -05:00
Bryan O'Sullivan
e55bd65d54
mercurial.el: deal with more vagaries of "hg status".
...
If we run "hg status" on a file that does not exist, it prints an error
message. Attempt to extract the name of the file.
2006-08-22 15:15:52 -07:00
Bryan O'Sullivan
c679ba9347
qrefresh: exit with status 1 if no patches applied.
2006-08-22 15:14:35 -07:00
Matt Mackall
656a5f8eb1
merge: simplify working dir manifest generation
2006-08-22 17:08:38 -05:00
Matt Mackall
ccb62f0c64
merge: simplify some update logic
2006-08-22 16:47:27 -05:00
Matt Mackall
d4f0a394a2
merge: hoist partial code out of manifest loops
2006-08-22 16:23:29 -05:00
Matt Mackall
df3ced818f
merge: minor simplification
2006-08-22 16:12:54 -05:00
Bryan O'Sullivan
01df2e50e5
mercurial.el: add hg-cwd
2006-08-22 14:03:10 -07:00
Bryan O'Sullivan
9447cded78
mercurial.el: speed up mode line updates.
2006-08-22 14:02:43 -07:00
Bryan O'Sullivan
154114b444
mercurial.el: add hg-status.
2006-08-22 11:37:18 -07:00
Bryan O'Sullivan
4d1786ec1f
mercurial.el: use parents in modeline, not tip
2006-08-22 11:36:58 -07:00
Bryan O'Sullivan
c4a476da55
mercurial.el: fix hg-chomp.
2006-08-22 11:24:59 -07:00
Bryan O'Sullivan
0127d671dc
mercurial.el: fix calls to goto-char.
2006-08-22 08:54:19 -07:00
Bryan O'Sullivan
093b29e224
mercurial.el: get rid of unportable, unperformant use of replace-regexp.
2006-08-22 08:53:37 -07:00
Vadim Gelfer
cc8e389567
merge.
2006-08-22 07:55:10 -07:00
Vadim Gelfer
a7d9a28fe9
merge.
2006-08-22 07:32:54 -07:00
Thomas Arendsen Hein
acc2d17e2f
Make test-strict append to $HGRCPATH, like other tests do since e6e7d87cb388.
2006-08-22 10:20:21 +02:00
Thomas Arendsen Hein
dd369da4a5
Merge with tah
2006-08-22 10:18:40 +02:00
Thomas Arendsen Hein
a1f1b33ecb
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
...
and add documentation for this.
2006-08-22 10:08:42 +02:00
Thomas Arendsen Hein
31b1fbbac8
Clear contents of global hgrc for tests before running each test.
...
This fixes running test-mq-qdiff after test-mq, because of changed settings.
2006-08-22 09:55:14 +02:00
Shun-ichi GOTO
c9dd534fc0
Support foo@bar notation as demandload module spec.
2006-08-22 14:31:56 +09:00
Bryan O'Sullivan
24286794a7
Add ui.strict config item.
...
This turns off command matching by unambiguous prefix, and is a good
thing if you want to write future-proof scripts.
This fixes issue 314.
2006-08-21 21:59:29 -07:00
Lee Cantey
32853e0761
Ignore .DS_Store directories
...
These are used by Finder on OS X.
2006-08-21 17:47:02 -07:00
Lee Cantey
2e459ed1d8
Allow for MB/sec transfer rates in test-http
2006-08-21 16:33:43 -07:00
Danek Duvall
3dfcc70c3e
patch queue: portability.notes
2006-08-21 14:13:27 -07:00
Vadim Gelfer
f7e52c304c
mq: fix bad interaction between demandload and update of commands.norepo
...
problem was that commands.norepo was not updated properly.
2006-08-21 13:59:17 -07:00
Matt Mackall
d746d64e0e
merge: rename mysterious variable
2006-08-21 14:25:56 -05:00
