Brendan Cully
791078de93
merge: Don't search for copies across unrelated manifests
2006-11-23 22:45:00 -08:00
Giorgos Keramidas
186991c839
Expand test-commit to cover one of the recent bugs.
2006-11-22 00:53:56 +02:00
Thomas Arendsen Hein
678567f5fc
Make mq use changegroup.writebundle for writing strip backups.
2006-11-22 23:07:15 +01:00
Thomas Arendsen Hein
ea20cdf3f7
Removed unused ui parameter from revpair/revrange and fix its users.
2006-11-22 23:02:28 +01:00
Thomas Arendsen Hein
873d44b19d
Use 'bundletype' instead of 'type' to not shadow built-in function.
2006-11-22 22:33:57 +01:00
Thomas Arendsen Hein
a73c25c144
BZ2Compressor already defaults to compresslevel=9.
2006-11-22 22:32:23 +01:00
Benoit Boissinot
0427029f2e
fix writebundle for bz2 bundles
2006-11-22 22:08:00 +01:00
Alexis S. L. Carvalho
cebbac3269
fix push over HTTP to older servers
2006-11-21 23:08:29 -02:00
Alexis S. L. Carvalho
6d99bd2633
Don't generate git patches that rename a file to multiple destinations
...
With this patch, instead of generating N renames, we'll generate
1 rename and N-1 copies.
Ideally the rename should come after the copies instead of before
them, but that'd be harder to do.
2006-11-20 19:32:46 -02:00
Alexis S. L. Carvalho
7f7845c518
handle git patches that rename a file to more than one destination
2006-11-20 19:32:45 -02:00
Alexis S. L. Carvalho
f6e774dd91
qrefresh: fix handling of copies in the fast path
2006-11-20 19:32:43 -02:00
Alexis S. L. Carvalho
63b6839f96
qrefresh: fix handling of added files (including copies) in the slow path
2006-11-20 19:32:42 -02:00
Alexis S. L. Carvalho
eb62b3a806
qrefresh: respect --git even in the slow path
2006-11-20 19:32:41 -02:00
Alexis S. L. Carvalho
b298d93260
add --git option to qdiff
2006-11-20 19:32:40 -02:00
Alexis S. L. Carvalho
f2de15a6f8
diff: better detection of renames when comparing with the working dir.
2006-11-20 19:32:38 -02:00
Alexis S. L. Carvalho
bc9e70b94a
fix typo in mercurial/patch.py
2006-11-20 19:32:37 -02:00
Alexis S. L. Carvalho
fdbef41b13
renamedbetween: only return (file, node) pairs that exist in the original rev
2006-11-20 19:32:36 -02:00
Alexis S. L. Carvalho
588b7cf1f1
diff: improve detection of renames when diffing across many revisions
2006-11-20 19:32:35 -02:00
Brendan Cully
185cd7ed4a
Merge with crew
2006-11-20 13:06:04 -08:00
Brendan Cully
83afafe362
mq: add --git option to qimport -r
2006-11-20 13:03:52 -08:00
Thomas Arendsen Hein
0bafb6f99d
Corrected "waiting for lock on repository FOO held by BAR" message.
...
BAR was the error number and not the locker name.
Use repr on BAR, so problems can be detected easier.
2006-11-20 19:55:59 +01:00
Thomas Arendsen Hein
f3d842aee0
Handle locking exceptions if streaming clone can't lock the repo. (Issue324)
2006-11-20 19:41:49 +01:00
Thomas Arendsen Hein
6046bbb871
Don't step into an endless loop when lock file is empty.
2006-11-20 19:36:28 +01:00
Mathieu Clabaut
6971cd5b8c
Issue424: mq patch loses guard when qrenamed
2006-11-19 23:47:19 +01:00
Matt Mackall
303ec3f442
correct remote heads test in prepush
2006-11-19 16:32:36 -06:00
Matt Mackall
9c3965d552
add docstring to reachable
2006-11-19 16:32:36 -06:00
Matt Mackall
38933f0e7f
reorder tests in prepush
...
It's more useful to show the new branches message than the unsynced
changes message.
2006-11-19 16:32:36 -06:00
Mathieu Clabaut
86f4680be6
Make qrefresh help more explanatory for options -m, -l and -s
2006-11-19 22:02:00 +01:00
Thomas Arendsen Hein
8675140170
Improved examples for network support in README.
...
- Simplified 'hg serve' example, -p80 needs root anyway.
- Example for ssh:// with relative or absolute path.
- merges need to be committed.
2006-11-20 21:03:02 +01:00
Alexis S. L. Carvalho
3a2243d8f7
fix qseries -v when there are unapplied patches
2006-11-19 17:01:59 -02:00
Thomas Arendsen Hein
d3c6666f73
Indentation cleanups for 16c127c30658.
2006-11-19 16:09:04 +01:00
Marcos Chaves
794888ecba
fix warnings generated by pygettext.py.
2006-11-18 17:20:38 -02:00
Alexis S. L. Carvalho
3508dfb573
Update trusted_users only after we've seen a file not owned by the user
2006-11-18 23:51:15 -02:00
Alexis S. L. Carvalho
6e218edeb5
Avoid looking up usernames if the current user owns the .hgrc file
...
Converting uids into usernames may be somewhat expensive when NIS
or LDAP is involved.
2006-11-18 23:51:14 -02:00
Alexis S. L. Carvalho
ad6b588b55
Use a variable to explicitly trust global config files
2006-11-18 23:51:13 -02:00
Alexis S. L. Carvalho
858dee209b
Revert almost all of 0ab603017f82; add a test
...
Because of file copies, we should update the manifest dict only after
committing all files.
2006-11-18 19:44:42 -02:00
Matt Mackall
f9f3aa2d91
avoid unnecessary copy merges
2006-11-18 11:34:19 -06:00
Thomas Arendsen Hein
411d64ce3e
white space and line break cleanups
2006-11-17 08:06:54 +01:00
Thomas Arendsen Hein
55e3c776d7
Merge with crew.
2006-11-16 08:52:55 +01:00
Thomas Arendsen Hein
3b57d6c4a0
Use nullrev+count instead of count-1 in a newly introduced expression.
...
Before that repo.changelog.tip() was used, but this yields a node.
Of course many more places should be changed like this, this was just done
as an example.
2006-11-16 08:51:22 +01:00
Matt Mackall
06b33366dc
abort if explicitly committed files are not found or not tracked
2006-11-15 23:59:39 -06:00
Matt Mackall
312ace343c
unduplicate bundle writing code from httprepo
2006-11-15 23:37:45 -06:00
Matt Mackall
96305ed7ba
remove duplicate zgenerator in httprepo
2006-11-15 15:51:58 -06:00
Matt Mackall
14645d0488
create a readbundle function
2006-11-15 15:51:58 -06:00
Matt Mackall
85f6bef03c
move write_bundle to changegroup.py
2006-11-15 15:51:58 -06:00
Matt Mackall
972bf0065b
remove legacy hg parents REV syntax
2006-11-15 15:51:58 -06:00
Matt Mackall
a43442fa8e
add log --removed
2006-11-15 15:51:58 -06:00
Matt Mackall
cb7c83c3e4
rename and copy are no longer experimental
2006-11-15 15:51:58 -06:00
Matt Mackall
53c22f6cd3
alphabetize help_ in commands
2006-11-15 15:51:58 -06:00
Matt Mackall
c526dfb885
remove relpath
2006-11-15 15:51:58 -06:00
