Brendan Cully
63fa2faa43
mq: gracefully abort qpush/qgoto to guarded patch (issue1186)
2008-11-23 00:44:31 -08:00
Brendan Cully
636630e1d2
mq: put qnew tests into own file, fold in qnew-twice
2008-10-30 12:31:24 -07:00
Brendan Cully
c935fe6e01
mq: abort qnew -f if any file in an explicit list cannot be read
2008-10-18 20:45:53 -07:00
Brendan Cully
203e3723e8
Prevent import over an applied patch (closes issue795)
2008-10-18 13:22:29 -07:00
Dirkjan Ochtman
fc7fc528ad
show enabled extensions in hg help
2008-10-18 16:50:03 +02:00
Benoit Boissinot
66c79ea6b0
merge with -stable
2008-09-22 14:47:21 +02:00
Mads Kiilerich
b80093e190
tests: fix reported patch tool name in test-mq
...
Strip any path of the patch executable, which it might return on failure.
2008-09-18 13:45:36 +02:00
Martin Geisler
897f1ddab8
i18n: avoid naive plural tricks
2008-08-31 16:12:02 +02:00
Dirkjan Ochtman
ff7fe64e1f
mq: don't update the working copy on strip if parents aren't stripped
...
* * *
2008-06-03 12:10:14 +02:00
Patrick Mezard
ae8e8e5874
test-mq: update qdiff summary output
2008-05-18 20:54:10 +02:00
Dirkjan Ochtman
7863711fa6
mq: don't commit local changes on pushing empty patch (issue1087)
2008-04-16 16:04:07 +02:00
Dirkjan Ochtman
466179d35f
mq: introduce the qfinish command
2008-06-03 09:34:14 +02:00
Dirkjan Ochtman
2cac185fe4
merge from crew-stable
2008-06-03 12:27:48 +02:00
Patrick Mezard
49ab85e83f
Merge with crew-stable
2008-05-18 23:49:33 +02:00
Matt Mackall
fb88571d19
match: remove files arg from repo.status and friends
2008-05-12 11:37:08 -05:00
Dirkjan Ochtman
f70807073f
merge from crew-stable
2008-04-16 16:07:15 +02:00
Dirkjan Ochtman
ea3191d104
mq: add --force option to strip
2008-04-04 17:44:31 +02:00
Matt Mackall
dc1cdafff7
mq: warn when applying a patch to somewhere other than tip
2008-03-21 15:44:11 -05:00
Adrian Buehlmann
153675561e
clone: print "updating working directory" status message
...
With this change, "hg clone" looks like this:
% hg clone http://example.com/repo/big big
requesting all changes
adding changesets
adding manifests
adding file changes
added XXX changesets with XXX changes to XXX files
updating working directory
XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
So the user sees
% hg clone http://example.com/repo/big big
requesting all changes
adding changesets
adding manifests
adding file changes
added XXX changesets with XXX changes to XXX files
updating working directory
while Mercurial is writing to disk to populate the working directory
With this change, "hg clone" looks like this:
% hg clone big big-work
updating working directory
XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
2008-03-21 14:52:24 +01:00
Dirkjan Ochtman
3e3b0d62eb
warn about new heads on commit (issue842)
2008-03-21 11:06:02 +01:00
Patrick Mezard
107a228e2f
patch: check filename is /dev/null for creation or deletion (issue 1033)
...
Otherwise, file creation or deletion is ambiguous with file being filled or
emptied.
2008-03-16 00:35:12 +01:00
Alexis S. L. Carvalho
8b9b7ae9bd
Merge with crew-stable
2008-02-08 18:31:55 -02:00
Alexis S. L. Carvalho
0a6e6532aa
qinit -c: add ^\.hg and ^\.mq to .hgignore
2008-02-08 18:07:55 -02:00
Alexis S. L. Carvalho
56322c7a24
mq: don't allow patches with some reserved names
...
The current list of reserved names includes only mq control files.
Also, reserve names starting with ".hg" (to avoid troubles with
e.g. .hgignore and .hgtags), and with ".mq" (to allow future
extensions).
This should fix issue841.
2008-02-03 21:03:46 -02:00
Alexis S. L. Carvalho
d4fc1890f0
mqrepo: don't abort if the status file has an unknown node
2008-02-03 21:03:46 -02:00
Alexis S. L. Carvalho
961a45df72
merge with crew-stable
2008-02-03 21:47:07 -02:00
Alexis S. L. Carvalho
7f21081e68
repair.py: don't import commands.py
2008-01-19 18:01:16 -02:00
Matt Mackall
11423d02c7
diff: don't show function name by default
...
We'd mistakenly made the -p option always on, which meant there was no
way to turn it off. It also meant that we were sometimes splitting
multibyte characters in function name, which isn't a good default.
2008-01-16 11:14:24 -06:00
Matt Mackall
62cb860a38
Backed out changeset f019d9201ff4
...
Unfortunately, this breaks backward compatibility.
2007-12-31 17:47:02 -06:00
Thomas Arendsen Hein
2be743c9ed
"C" status code considered harmful, so changed to "=" (issue899)
...
C means conflict in other SCMs, and = is more intuitive anyway.
2007-12-30 17:45:26 +01:00
Patrick Mezard
8ae803be30
mq: avoid qnew committing everything on invalid paths (issue 803)
...
If paths are supplied but resolve to nothing, localrepo.commit() is called with an empty set and commits the whole dirstate. Avoid this by passing the match function to commit.
2007-11-20 14:31:58 +01:00
Brendan Cully
92a19d3a72
mq: fix regression in c5d80ff6828f
...
It caused qrefresh; qrefresh -X addedfile to leave the file as normal in dirstate.
It should be marked added on the second pass.
2007-09-10 15:00:05 -07:00
Patrick Mezard
55cd10d565
Test qnew --git
2007-07-28 20:15:54 +02:00
Bryan O'Sullivan
bbc8c72100
Update test output to reflect small changes in patch chattiness.
2007-07-17 09:39:30 -07:00
Bryan O'Sullivan
3ab73cd145
mq: autodetect an existing git patch during qrefresh (issue 491)
2007-07-16 16:50:47 -07:00
Brendan Cully
98b8fae908
mq: improve qclone error handling when patch directory is not a repository.
2007-07-10 09:52:32 -07:00
Bryan O'Sullivan
fd12095b02
mq: add qgoto command.
2007-05-08 13:10:27 -07:00
Alexis S. L. Carvalho
047c4b002b
Merge with crew-stable.
2007-04-07 04:45:27 -03:00
Alexis S. L. Carvalho
8e9491052e
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
...
This should make it easier to discover global options.
As a bonus, they are no longer displayed by something like a
hg -v help dates
2007-04-07 04:27:55 -03:00
Alexis S. L. Carvalho
47cb22b5a2
Merge with crew-stable
2007-03-16 00:45:18 -03:00
Brendan Cully
c7cf8a52b7
mq: add qparent tag (first parent of qbase)
2007-03-14 10:45:18 -07:00
Brendan Cully
5641becd5a
Merge with crew-stable
2007-03-10 17:45:32 -08:00
Alexis S. L. Carvalho
d3e0262e32
fix qrefresh'ing an empty patch
...
This is not superefficient (the commit will have to walk the whole tree),
but it works.
2007-03-10 22:03:23 -03:00
Alexis S. L. Carvalho
86353c5094
qclone: don't call reposetup manually
2007-02-15 08:44:08 -02:00
Alexis S. L. Carvalho
5357b68523
fix strip'ping the second parent of a merge
2007-02-06 15:54:58 -02:00
Alexis S. L. Carvalho
b380c48d7c
add some tests for qpush/qpop error codes
2007-02-17 04:50:06 -02:00
Alexis S. L. Carvalho
d4de823a64
merge with crew-stable
2007-02-16 05:27:37 -02:00
Alexis S. L. Carvalho
d8dc29a091
mq: qinit -c creates a repo even after a regular qinit
2007-02-09 03:48:30 -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