Matt Mackall
cfe7a0a522
merge: make test for fast-forward merge stricter (issue619)
...
don't allow merging with an ancestor
fix != on contexts
add a test
2007-07-05 13:34:18 -05:00
Alexis S. L. Carvalho
8c2c88e404
Make hg add foo; hg mv foo bar work.
...
- foo will be removed (the user has a copy of its contents in bar)
- bar will not be marked as a copy (there was no committed version of foo).
We print a warning telling that to the user.
Fixes issue269.
2007-07-03 03:06:40 -03:00
Alexis S. L. Carvalho
a21d4fc96a
test-copy2: use status -C instead of debugstate | grep copy
2007-07-03 03:06:40 -03:00
Alexis S. L. Carvalho
d69c63e916
test-rename: use hg status -C; don't use hg debugstate | grep copy
2007-07-03 03:06:40 -03:00
Brendan Cully
b1034db3e9
Handle extensions with defined but empty cmdtable
2007-06-28 21:16:25 -07:00
Brendan Cully
edeeaca988
mq: more qdelete help text tweaks
2007-06-28 09:19:08 -07:00
Brendan Cully
98fb3fa634
mq: require patch argument or revision for qdelete
2007-06-28 08:42:43 -07:00
Thomas Arendsen Hein
d17146e533
Make hg glog abort if unused arguments are given.
2007-06-28 16:18:09 +02:00
Thomas Arendsen Hein
4784c1900b
Abort if earlygetopt fails to detect an option.
...
Otherwise it could happen that a command is used on the wrong repository,
because abbreviations of --cwd or --repository were ignored.
2007-06-28 16:03:45 +02:00
Thomas Arendsen Hein
e10fcd1450
Disallow short earlygetop option combined with other short options
...
While "hg commit -qRfoo" can be read as "--quiet --repository foo",
"hg commit -mRfoo" should be "--message Rfoo".
2007-06-27 20:37:33 +02:00
Thomas Arendsen Hein
0b7147a667
Updated command tables in commands.py and hgext extensions.
...
- Marked for translation where extensions already had _()
- Corrected indentation
- fixed a few synopsises
2007-06-26 22:38:57 +02:00
Thomas Arendsen Hein
c6d47ef08c
Catch illegal boolean values in hgrc nicely.
...
With hg 0.9.3 the section and parameter name wasn't printed,
with hg 0.9.4 there was a traceback for ValueError.
2007-06-26 20:37:15 +02:00
Thomas Arendsen Hein
b90da02eb3
Added test for earlygetopt fixes (8301dd2ee152 and fd08e85716bd)
2007-06-26 18:39:28 +02:00
Thomas Arendsen Hein
5b3cfe2be9
Fix and test 'hg backout' without or with too many revisions.
2007-06-26 15:28:17 +02:00
Brendan Cully
23fe084573
mq: regularize patch header creation.
...
Do not prefix qnew patches with [mq]: when a message has been given.
Always use [mq]: as the prefix for generated commit messages.
2007-06-25 15:57:01 -07:00
Matt Mackall
469dca271e
backout: report short hash in commit message
2007-06-25 12:44:48 -05:00
Giorgos Keramidas
5f8125a5a3
unbundle: accept multiple file arguments
...
update test-bundle for multiple unbundle support
2007-06-24 10:08:38 -05:00
Giorgos Keramidas
5a0956cb5a
tests: add merge test for changeset 32f6be9c37df
...
When all the files in a directory are moved somewhere else, and new
files are added in changesets of the local branch, a subsequent pull
and merge shouldn't rename the locally added files too.
2007-06-23 22:43:46 -05:00
Emanuele Aina
5968bafc17
purge: don't delete ignored files if --all is not specified
2007-06-06 22:17:35 +02:00
Alexis S. L. Carvalho
cc6e60f60e
merge: fix small bug with a failed merge across a rename
...
If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy
f to fd, and util.set_exec wouldn't find the file.
2007-06-22 20:44:40 -03:00
Alexis S. L. Carvalho
e85eaa593d
git patches: correct handling of filenames with spaces
...
Add a trailing TAB to the "--- filename" lines if there's a space
in the file name. This allows patch(1) to work correctly. The
same is done for diff --nodates.
This was originally suggested by Andrei Vermel, but at the time
I thought git was doing something different.
2007-06-22 19:06:04 -03:00
Alexis S. L. Carvalho
64a37442ed
dirstate.status: if a file is marked as copied, consider it modified
...
After a "hg copy --force --after somefile cleanfile", cleanfile
shouldn't be considered clean anymore.
2007-06-21 23:42:06 -03:00
Matt Mackall
265560b37a
Merge with Eric Hopper
2007-06-21 18:05:14 -05:00
Matt Mackall
a38809cf9e
merge: warn user about divergent renames
2007-06-21 18:02:03 -05:00
Eric Hopper
964ff0a5e3
Change branches to sort 'active' branches first, and add an option to show only active branches.
2007-06-21 10:40:09 -07:00
Matt Mackall
a0395f3952
identify: accept a revision argument
2007-06-21 11:54:11 -05:00
Matt Mackall
1f80f939a9
identify: show nullid for empty repo
2007-06-21 11:42:39 -05:00
Thomas Arendsen Hein
3019bb7a0b
Kill trailing spaces
2007-06-21 09:25:49 +02:00
Alexis S. L. Carvalho
1d182cc78a
mq: test that qpush cleans things up when it fails
2007-06-21 00:34:14 -03:00
Alexis S. L. Carvalho
2bdde5e379
update the output of test-help and test-globalopts
2007-06-21 00:34:14 -03:00
Brendan Cully
f7e826dad3
Fix dispatch error message when not in a repo
2007-06-20 20:13:31 -07:00
Brendan Cully
5e31fc3bf9
archive: test md5 consistency
2007-06-20 19:20:37 -07:00
Brendan Cully
e756af498f
Test attempt to remove nonexistent tag
2007-06-20 18:09:40 -07:00
Brendan Cully
95c08c2bfc
Small fixes for 3acdabb0ef1d (hg heads branch)
2007-06-20 17:53:11 -07:00
Eric Hopper
0bcc9fc15c
Add option to heads to show only heads for current branch.
2007-06-19 08:37:43 -07:00
Patrick Mezard
6ef4333a38
Add tests for ui.patch regression.
2007-06-20 23:32:31 +02:00
Patrick Mezard
82fd511346
printenv: filter empty environment variables for portability.
2007-06-20 22:06:37 +02:00
Patrick Mezard
0b90ff3d83
Merge with crew-stable
2007-06-20 00:22:51 +02:00
Patrick Mezard
7607881784
test-annotate: add a test for issue 589.
2007-06-20 00:10:21 +02:00
Patrick Mezard
b6b2a3d29a
Add test for debugrename
2007-06-20 00:09:32 +02:00
Thomas Arendsen Hein
3dcf92c53d
Use printenv.py for pre/post-command-hooks (fixes tests on Solaris, too)
2007-06-19 08:17:55 +02:00
Thomas Arendsen Hein
483231d996
Cleanup of whitespace, indentation and line continuation.
2007-06-19 08:06:37 +02:00
Matt Mackall
ab72eb680f
demandimport: fix issue579 and add a test
...
fix suggested by Brendan
2007-06-18 19:43:26 -05:00
Matt Mackall
c61bc27ccc
dispatch: add generic pre- and post-command hooks
2007-06-18 17:49:56 -05:00
Brendan Cully
a4f4ecdc68
Merge with mpm
2007-06-18 12:39:43 -07:00
Brendan Cully
b969d388db
Make fast-forward merges full merges
2007-06-18 12:38:54 -07:00
Matt Mackall
5ecb0cb232
dispatch: fix handling of incorrect number of arguments
2007-06-18 13:24:34 -05:00
Matt Mackall
579d9e3b44
encoding: pull fallbackencoding out of localrepo into early parsing
2007-06-18 13:24:34 -05:00
Brendan Cully
988e3fb1da
Fix up tests for new branch message
2007-06-18 11:13:16 -07:00
Patrick Mezard
f2a33f2a1b
Merge with crew-stable
2007-06-17 20:08:06 +02:00