Brendan Cully
c7dc3bf62b
convert: svn: ensure leading / is removed from paths in _find_children (broken in e1a302eaf619)
2007-08-04 18:02:37 -07:00
Thomas Arendsen Hein
325c8db06b
merge with crew-stable
2007-08-04 22:27:52 +02:00
Thomas Arendsen Hein
ae0d60a260
Simplify/correct finding the hg executable (fixes issue644)
...
Simply use find_exe('hg') as the default value for $HG and require to manually
set it if you have special requirements.
While the default will not always be 100% correct (i.e. the identical hg
version) for many users it is and for the others the hg executable found in
the PATH should do most things correctly.
Developers or other users with multiple installs can set $HG or run something
like util.set_hgexecutable in their shell or python scripts.
Additionally util.hgexecutable() is now available so extensions can access
the value with a public interface, too.
2007-08-04 22:25:12 +02:00
Bryan O'Sullivan
b7ce9fcfbd
convert: drop duplicated assignments.
2007-08-04 12:38:30 -07:00
Brendan Cully
8b26a09d27
imerge: gussy up dispatcher to support subcommand opts.
...
Add -n, --resolved, --unresolved to status.
2007-08-04 12:26:48 -07:00
Brendan Cully
6f2a9d642d
Merge with crew
2007-08-04 09:33:10 -07:00
Thomas Arendsen Hein
892866e7c0
merge with crew-stable
2007-08-04 09:48:21 +02:00
Brendan Cully
9fa1148786
imerge: handle renames
2007-08-03 18:05:20 -07:00
Patrick Mezard
17bfcef457
convert: support windows SVN simple auth provider
2007-08-02 23:38:32 +02:00
Matt Mackall
f5270b4251
Merge with -stable
2007-08-02 13:23:53 -05:00
Matt Mackall
2cee92939f
merge: avoid double deletion mentioned in issue636
2007-08-02 12:29:10 -05:00
Thomas Arendsen Hein
7f36ffc2b5
The >| redirection does not exist in plain sh.
2007-08-02 14:51:49 +02:00
Thomas Arendsen Hein
ab1cf115c1
The >| redirection does not exist in plain sh.
2007-08-02 14:51:49 +02:00
Thomas Arendsen Hein
0dfe60884f
imerge: sorted() is only available in python2.4 and above
2007-08-02 14:04:51 +02:00
Benoit Boissinot
3588fd3abd
imerge: tarfile.extractall is only available in python2.5
2007-08-02 14:04:00 +02:00
Thomas Arendsen Hein
aca6be7686
merge with hg-stable
2007-08-02 13:03:25 +02:00
Brendan Cully
a23047ab44
Update imerge for new filemerge interface
2007-08-01 23:59:19 -07:00
Alexis S. L. Carvalho
5af674774c
del transaction before lock before wlock
...
This way rollbacks happen while the repo is still locked.
Deleting lock before wlock is not strictly necessary, but is
more consistent with the locking order.
2007-08-02 01:56:08 -03:00
Alexis S. L. Carvalho
181f0a3596
convert: fix locking order
2007-08-02 01:56:08 -03:00
Alexis S. L. Carvalho
6aba65ae68
update tests output
2007-08-02 01:56:08 -03:00
Brendan Cully
70d50ced47
convert: (svn) simplify _find_children
2007-08-01 15:16:42 -07:00
Brendan Cully
1519ab31fb
Merge with stable
2007-08-01 14:32:53 -07:00
Brendan Cully
a3d0fd0b0d
Update asciidoc instructions to suggest html4 for newer versions
2007-08-01 14:32:05 -07:00
Brendan Cully
fc8076b99a
Merge with mpm
2007-08-01 14:26:30 -07:00
Bryan O'Sullivan
9f09f6b444
Automated merge with http://hg.intevation.org/mercurial/crew
2007-08-01 12:03:50 -07:00
Matt Mackall
600c42bfbf
Merge with stable
2007-08-01 14:03:48 -05:00
Bryan O'Sullivan
a487c999a8
dirstate: improve error message on file/directory clash
2007-08-01 12:03:10 -07:00
Brendan Cully
dbb657852c
imerge extension and test
2007-08-01 11:37:11 -07:00
Matt Mackall
d76c06eeb0
merge: do early copy to deal with issue636
...
Without copies/renames, merges source names are 1:1 with their
targets. Copies and renames introduce the possibility that there will
be two merges with the same input but different output. By doing the
copy to the destination name before the merge, the actual merge
becomes 1:1 again, and no source is the input to two different merges.
- add a preliminary scan to applyupdates to do copies
- for the merge action, pass the old name (for finding ancestors) and
the new name (for input to the merge) to filemerge
- eliminate the old post-merge copy
- lookup file contents from new name in filemerge
- pass new name to external merge helper
- report merge failure at new name
- add a test
2007-08-01 12:33:12 -05:00
Bryan O'Sullivan
b89554c4ea
localrepository: allow rawcommit to commit with an empty message
2007-08-01 09:57:05 -07:00
Thomas Arendsen Hein
c6fa90f553
Update style of record's cmdtable to match mercurial/commands.py
2007-08-01 10:42:42 +02:00
Thomas Arendsen Hein
e05f361209
os.isatty isn't available on Windows, so use sys.stdin.isatty()
2007-08-01 10:33:21 +02:00
Bryan O'Sullivan
bfb3dfc715
convert: add config option to turn off use of branch names
2007-07-31 17:18:59 -07:00
Bryan O'Sullivan
a79766b2cd
Add record extension, giving darcs-like interactive hunk picking
2007-07-31 16:28:05 -07:00
Bryan O'Sullivan
80c88dabf8
ui: get readline and prompt to behave better depending on interactivity
2007-07-31 16:28:05 -07:00
Bryan O'Sullivan
ce7f264f24
patch: make internal code a bit friendlier to use
2007-07-31 16:28:05 -07:00
Bryan O'Sullivan
3bcee4b94e
commands: move commit to cmdutil as wrapper for commit-like functions
2007-07-31 16:28:05 -07:00
Bryan O'Sullivan
46b7a3a9ca
patch: remove unused parameter from b85diff
2007-07-30 20:49:08 -07:00
Bryan O'Sullivan
d761a6e964
Update expected test output
...
It's no longer a "problem" to have the same name listed with no prefix
and a "hgext." prefix.
2007-07-30 20:48:50 -07:00
Bryan O'Sullivan
f2fb8a0b42
extensions: don't get confused by aliasing between "foo" and "hgext.foo"
2007-07-30 14:53:03 -07:00
Thomas Arendsen Hein
1640028059
merge with crew-stable
2007-07-30 20:06:11 +02:00
Thomas Arendsen Hein
c8e49d5f09
Fix re: and glob: patterns in .hgignore (reported by Brad Schick)
...
relglob: and relre: were already detected for a long time, so
I kept this undocumented functionality, especially as it was already
tested in test-hgignore.
2007-07-30 20:01:16 +02:00
Thomas Arendsen Hein
c5409343d1
test-convert: Hide warning about missing subversion bindings.
2007-07-29 19:32:55 +02:00
Thomas Arendsen Hein
8778149e15
Fix bashism and remove useless use of cat.
2007-07-29 18:53:09 +02:00
Patrick Mezard
55cd10d565
Test qnew --git
2007-07-28 20:15:54 +02:00
Patrick Mezard
70ab7b4b41
mq: add qnew --git option
2007-07-28 20:15:54 +02:00
Bryan O'Sullivan
e5831bba91
convert: empty log messages are OK as of d10c8cd5d283
2007-07-27 14:30:20 -07:00
Bryan O'Sullivan
04aae067fa
localrepo.commit: only munge comment text if committing via dirstate
2007-07-26 14:47:31 -07:00
Bryan O'Sullivan
8cd3c03796
convert: make test-convert executable
2007-07-26 14:08:39 -07:00
Brendan Cully
0c1f3fe27b
Merge with bos
2007-07-26 14:04:48 -07:00
