Brendan Cully
dc483d8d44
Add transplant extension
2006-11-27 15:13:01 -08:00
Benoit Boissinot
684e2e23c3
don't create the .hg/data at init time
2006-11-27 22:22:44 +01:00
Giorgos Keramidas
186991c839
Expand test-commit to cover one of the recent bugs.
2006-11-22 00:53:56 +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
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
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
Alexis S. L. Carvalho
3a2243d8f7
fix qseries -v when there are unapplied patches
2006-11-19 17:01:59 -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
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
Matt Mackall
37174271f4
refactor debugrenamed
2006-11-15 15:51:58 -06:00
Matt Mackall
f40fcaac75
Refactor log ui buffering and patch display
2006-11-13 13:26:57 -06:00
Matt Mackall
6b93d4c0fd
tests: add -i switch
...
Prompt to accept changes for tests where output changed
2006-11-08 13:20:08 -06:00
Matt Mackall
4dc56ee619
tests: add -R switch
...
Restarts at first .err file if one exists, otherwise runs all tests
2006-11-08 13:20:08 -06:00
Matt Mackall
a6ea08deb0
tests: sort test list if running all tests
2006-11-08 13:20:08 -06:00
Matt Mackall
6b5e168d5c
Fix up parent display in logging
...
For changesets with a first parent nullid, but not rev 0, we ought to
display a null parent.
2006-11-07 14:04:15 -06:00
Matt Mackall
6239f7b678
Clarify untracked file merge message
2006-11-01 21:47:55 -06:00
Benoit Boissinot
7d00e37112
issue352: disallow '\n' and '\r' in filenames (dirstate and manifest)
2006-11-01 17:56:55 +01:00
Benoit Boissinot
e12d0530f2
merge with crew
2006-10-31 13:03:52 +01:00
Benoit Boissinot
3f2046d235
Backed out changeset 0fc94973be4ffeb0b5ace8a920dec676a9a51130
2006-10-31 13:02:49 +01:00
Brendan Cully
2e8580188f
test for git empty new files
2006-10-30 16:14:38 -08:00
Benoit Boissinot
58322272ec
allow update to switch to a different branch if the repo is clean
2006-10-29 13:08:10 +01:00
Alexis S. L. Carvalho
17f016acd0
Correct optimization from 56bc6966622e; add a test.
...
If there are two (or more) heads that point to the same .hgtags
node, we can safely skip parsing the file in all but the last head.
(In 56bc6966622e, we were parsing the file in the first head and
skipping all the others.)
2006-10-28 23:37:59 -03:00
Thomas Arendsen Hein
11cdc6b21b
Merge with upstream
2006-10-27 23:09:46 +02:00
Matt Mackall
53e3681702
Fixups for hg grep
...
- kill trimuser function
- remove ucache
- simplify descending logic
- fix files with matches logic
- correct tests
2006-10-26 14:04:58 -05:00
Alexis S. L. Carvalho
cb59e4de82
save settings from untrusted config files in a separate configparser
...
This untrusted configparser is a superset of the trusted configparser,
so that interpolation still works.
Also add an "untrusted" argument to ui.config* to allow querying
ui.ucdata.
With --debug, we print a warning when we read an untrusted config
file, and when we try to access a trusted setting that has one value
in the trusted configparser and another in the untrusted configparser.
2006-10-26 19:25:45 +02:00
Alexis S. L. Carvalho
c44cea1532
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.
This is essentially the same patch that was previously applied as
revision f077d29b114d.
2006-10-26 19:25:44 +02:00
Matt Mackall
ae91bf4e42
Update tests for removed commands
2006-10-25 18:31:49 -05:00
Matt Mackall
dda61fef33
Remove old fish-merge test
2006-10-25 16:45:39 -05:00
Thomas Arendsen Hein
47d731406a
Show number (-v) and list (--debug) of changesets with bundle/pull/push etc.
2006-10-25 18:45:18 +02:00
Alexis S. L. Carvalho
846337c179
Test that we notice the empty files from the second parent during a merge
...
This didn't work with 0.9.1, but was fixed by 41b753e617ee.
2006-10-25 02:51:27 -03:00
Matt Mackall
8b1ec529ff
Deprecate old --branch/branches options
2006-10-24 17:07:11 -05:00
Matt Mackall
afebc36749
add branch and branches commands
2006-10-24 16:49:36 -05:00
Alexis S. L. Carvalho
a9ec95a18c
test-mq-caches: look up a revision that does not exist to force cache creation
2006-10-24 17:49:48 -03:00
Brendan Cully
45cd7b7440
Merge with mpm
2006-10-24 13:42:21 -07:00
Matt Mackall
49503fb772
Merge with crew
2006-10-24 13:46:04 -05:00
Alexis S. L. Carvalho
aa3a52a4cd
make mq play nicely with the branch cache
...
- if no patches are applied, don't do anything different
- if the cache includes valid data from one of the patch revisions,
use the cache, but don't save anything new
- if the cache has data from before the patch revisions only,
save what the list of branches would be without the patch revisions
2006-10-23 23:32:56 -03:00
Thomas Arendsen Hein
37655ca869
Commit username: Better error message, abort on empty name, fix documentation.
2006-10-23 14:56:51 +02:00
Alexis S. L. Carvalho
acb8dbb57f
Don't use test -e in tests - sh doesn't like it on Solaris
2006-10-18 18:47:50 -03:00
Alexis S. L. Carvalho
bb1e7c9b30
Update tests output
2006-10-18 18:44:23 -03:00
Benoit Boissinot
dc9483558a
makes username mandatory
2006-10-18 22:24:03 +02:00
Matt Mackall
aa8e8c430f
Use file contexts in tags code
2006-10-18 14:14:59 -05:00
