Matt Mackall
c24a0d4e76
merge: reorder remote creation tests
2009-06-08 18:14:44 -05:00
Matt Mackall
58ccf87682
merge: drop recreating case
2009-06-08 18:14:44 -05:00
Matt Mackall
65d08ecb3f
merge: drop an overwrite test
2009-06-08 18:14:44 -05:00
Matt Mackall
fee35db526
merge: simplify a delete case
2009-06-08 18:14:44 -05:00
Matt Mackall
3d83e5d92a
merge: reorder get cases for future simplification
2009-06-08 18:14:44 -05:00
Matt Mackall
7d4488886a
merge: fix prompt keep
2009-06-08 18:14:44 -05:00
Matt Mackall
2c65849ffa
merge: remove a flags case
2009-06-08 18:14:44 -05:00
Matt Mackall
da4ac4f699
merge: pretend ancestor is local to simplify backwards and overwrite
2009-06-08 18:14:44 -05:00
Matt Mackall
60cf366277
merge: simplify flag merging code slightly
2009-06-08 18:14:44 -05:00
Steve Borho
2cd8aa240a
merge: give hint as to how to discover uncommitted changes
...
Many users will try 'hg diff' here, and it will not show them missing files.
2009-05-22 11:42:21 -05:00
Benoit Boissinot
fc43ae9519
update --clean: do not unlink added files (issue575)
2009-05-19 03:59:58 +02:00
Dirkjan Ochtman
43d9564cff
some modernization cleanups, forward compatibility
2009-05-13 14:08:39 +02:00
Simon Heimberg
09ac1e6c92
separate import lines from mercurial and general python modules
2009-04-28 17:40:46 +02:00
Steve Borho
52bf113f2e
ui: replace regexp pattern with sequence of choices
...
Use ampersands (&) to delineate the response char in each choice.
ui.prompt() responses are now explicitly case insensitive. GUIs
that subclass ui can generate dialogs from the full choice names.
2009-04-30 10:15:32 -05:00
Martin Geisler
750183bdad
updated license to be explicit about GPL version 2
2009-04-26 01:08:54 +02:00
Martin Geisler
e2222d3c43
replace set-like dictionaries with real sets
...
Many of the dictionaries created by dict.fromkeys were emulating sets.
These can now be replaced with real sets.
2009-04-22 00:57:28 +02:00
Ronny Pfannschmidt
5356baa346
switch lock releasing in the core from gc to explicit
2009-04-22 02:01:22 +02:00
Matt Mackall
805511403b
resolve: move reset to localrepo.commit
...
This way rebase doesn't leave a stale resolve state
2009-03-16 16:58:41 -05:00
Matt Mackall
d7c2a2e49b
merge: mark kept local files as readded on linear update (issue539)
2009-02-15 10:50:48 -06:00
Patrick Mezard
6aa7cd6f84
Merge with crew-stable
2009-01-13 23:17:19 +01:00
Patrick Mezard
a70c4ebc9d
merge: fix execute bit update issue introduced by db8aabe14ff1
2009-01-13 22:41:06 +01:00
Benoit Boissinot
9eaa24618d
correctly update dirstate after update+mode change (issue1456)
2009-01-07 02:11:17 +01:00
Dirkjan Ochtman
574603a8c0
use dict.iteritems() rather than dict.items()
...
This should be faster and more future-proof. Calls where the result is to be
sorted using util.sort() have been left unchanged. Calls to .items() on
configparser objects have been left as-is, too.
2009-01-12 09:16:03 +01:00
Matt Mackall
48ebb7a1ba
merge: fix bug going backwards for already reverted files (issue1303)
2008-10-08 16:22:08 -05:00
Martin Geisler
28fb695e9a
i18n: mark strings for translation in Mercurial
2008-08-31 16:12:02 +02:00
Dirkjan Ochtman
6b51480caa
merge with crew-stable
2008-08-12 17:47:08 +02:00
Matt Mackall
e03f4e2f73
util: set_flags shouldn't know about repo flag formats
2008-08-10 21:55:06 -05:00
Paul Moore
ab028fc78a
Sort removes first when applying updates (fixes issues 750 and 912)
...
This change ensures that removes happen first in applyupdates(). This avoids
issues where we try to make a case-only rename of a file on a case insensitive
system. Without this patch, the add of the new name happens before the remove
of the old one - which results in the file not existing, as the two names are
effectively the same.
With the patch, the old name gets removed then the new one gets added, which
is always safe.
2008-07-01 17:59:31 +01:00
Matt Mackall
a65ef7bc5d
util: add sort helper
2008-06-27 18:28:45 -05:00
Matt Mackall
fbb5127472
use repo[changeid] to get a changectx
2008-06-26 14:35:46 -05:00
Matt Mackall
b2155285a8
rename checkfolding to checkcase
2008-06-26 13:58:24 -05:00
Matt Mackall
5867ff1667
use repo.changectx(None) to get a workingctx
2008-06-26 13:46:29 -05:00
Patrick Mezard
d06361ae38
merge: replace readline() call, missing from posixfile_nt
2008-04-12 20:51:26 +02:00
Matt Mackall
edf5a0f5d0
resolve: new command
...
- add basic resolve command functionality
- point failed update and merge at resolve
2008-04-11 12:52:56 -05:00
Dirkjan Ochtman
77eea08b47
python-2.6: use sha wrapper from util for new merge code
2008-04-11 12:04:26 +02:00
Matt Mackall
8d82cba09a
merge: introduce mergestate
2008-04-10 15:02:24 -05:00
Matt Mackall
c9895536f8
copies: skip directory rename checks when not merging
...
The directory rename checks are not meaningful unless we're moving or copying
files across a branch during a merge.
2008-03-29 12:39:47 -05:00
Thomas Arendsen Hein
5690af9ff7
Fix missing space in one of the new update messages.
2008-03-24 20:28:13 +01:00
Matt Mackall
fb8b59de16
update: better logic and messages for updates
...
- complain about attempts to merge with ancestor
- when updating, differentiate between
- crossing named branches with no local changes (jump)
- crossing named branches with local changes (complain)
- nonlinear update on the same named branch, no changes (complain some more)
- nonlinear update on the same named branch, changes (different complaining)
2008-03-24 10:01:05 -05:00
Matt Mackall
9454e6e5aa
update: no -C needed to switch branches without outstanding changes
2008-03-22 13:30:08 -05:00
Matt Mackall
5c5200eb63
diff: use copy smarts from copies.py
2008-03-15 10:02:31 -05:00
Matt Mackall
79c8f65d30
copies: move findcopies code to its own module
...
- pass in contexts
- fold symmetricdifference check into copies.copies
2008-03-15 10:02:31 -05:00
Matt Mackall
ce54a3ea46
merge: move symmetricdifferences to ancestor.py
2008-03-15 10:02:31 -05:00
Matt Mackall
f1d323b3b4
merge: simplify some helpers
2008-03-15 10:02:31 -05:00
Matt Mackall
67e4145eba
merge: more simplifications to checkcopies
2008-03-15 10:02:31 -05:00
Matt Mackall
8cbc2c104e
merge: simplify checkcopies
2008-03-15 10:02:31 -05:00
Matt Mackall
3a2aa805f9
merge: privatize some functions, unnest some others
2008-03-15 10:02:31 -05:00
Alexis S. L. Carvalho
af51350c6e
merge: notice uncommited copies (issue1000)
...
As mentioned in msg5349 in issue988, "hg update" doesn't take into account
uncommitted copies. To reproduce:
----------------
hg init repo
cd repo
touch foo
hg ci -Am 'add foo'
echo >> foo
hg ci -m 'change foo'
hg up -C 0
hg mv foo bar
HGMERGE=false thg --debug -y update
--------------------------
A similar problem happens with hg merge --force.
I'm attaching a possible patch.
2008-03-14 11:01:31 -05:00
Alexis S. L. Carvalho
fa062ecb4c
merge: require --force when there are deleted files
2008-03-14 09:56:58 -03:00
Alexis S. L. Carvalho
d98fc139f2
merge: fix handling of deleted files
2008-03-12 15:44:08 -07:00
