Alexis S. L. Carvalho
47cb22b5a2
Merge with crew-stable
2007-03-16 00:45:18 -03:00
Matt Mackall
e896adead6
Merge with -stable, fix small test failure
2007-03-14 01:26:09 -05:00
Matt Mackall
c2bb73121f
Move branch read/write to dirstate where it belongs
2007-03-13 18:50:02 -05:00
Brendan Cully
5641becd5a
Merge with crew-stable
2007-03-10 17:45:32 -08:00
Matt Mackall
4458a1780a
merge: fix renaming of subdirectories under renamed directories
2007-02-27 16:20:06 -06:00
Matt Mackall
53a83c6c22
Merge with stable
2007-02-27 16:47:16 -06:00
Matt Mackall
de434078f7
symlinks: minimal support for symlinks in merge/update
...
This will get angry, confused, and sad if you try to merge a symlink
with a regular file.
2006-12-29 20:04:31 -06:00
Matt Mackall
9a533e02cb
symlinks: add flags param to wwrite
...
Now wwrite can set symlink and exec for files
2006-12-29 20:04:31 -06:00
Matt Mackall
8ed93098b6
replace filehandle version of wwrite with wwritedata
2006-12-29 20:04:31 -06:00
Matt Mackall
296d6a7cb8
Simplify i18n imports
2006-12-14 20:25:19 -06:00
Matt Mackall
f17a4e1934
Replace demandload with new demandimport
2006-12-13 13:27:09 -06:00
Matt Mackall
2623870448
Remove deprecated old-style branch support
2006-12-12 18:16:23 -06:00
Matt Mackall
d9f0b69ae5
Fix copy detection corner case
...
We were aborting if the copied from rev was before the cut-off limit,
rather than the copied _to_ rev. The copied from rev can be
arbitrarily old.
2006-12-12 17:52:33 -06:00
Alexis S. L. Carvalho
63ae667098
Use UTF-8 in .hg/branch
2006-12-10 20:35:28 -02:00
Matt Mackall
a8fff7f220
imported patch collision
2006-12-04 17:10:31 -06:00
Matt Mackall
aaf36f881a
Handle transcoding of branch names
2006-12-03 16:16:33 -06:00
Matt Mackall
05748f203d
merge: handle directory renames
...
commit: handle new copy dirstate case correctly
findcopies:
keep a map of all copies found for directory logic
add dirs filter
check for merge:followdirs config option
generate a directory move map
find files that match directory move map
manifestmerge:
add directory rename cases
applyupdates:
skip actions with None file
add "d" action
recordupdates:
add "d" action
add simple directory rename test
2006-11-30 17:36:33 -06:00
Matt Mackall
452ab5fc24
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
2006-11-30 17:36:33 -06:00
Matt Mackall
f8e4088f12
merge: move check for empty ancestor into findcopies
2006-11-30 17:36:33 -06:00
Matt Mackall
f9ab52977a
merge: only store one direction of copies in the copy map
...
simplify checkpair
generate copied hash from copy map
make copy cases more symmetrical
2006-11-30 17:36:33 -06:00
Matt Mackall
224d8a5d1f
merge: add copied hash to simplify copy logic
2006-11-30 17:36:33 -06:00
Matt Mackall
1c0e2e44bd
merge: remove unused match logic from findcopies
2006-11-30 17:36:33 -06:00
Matt Mackall
8732a61bab
merge: report destinations of moves in merge action messages
2006-11-30 17:36:33 -06:00
Brendan Cully
261404dfe1
Make context __eq__ handle arbitrary RHS values
2006-11-27 15:27:09 -08:00
Brendan Cully
791078de93
merge: Don't search for copies across unrelated manifests
2006-11-23 22:45:00 -08: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
Matt Mackall
6239f7b678
Clarify untracked file merge message
2006-11-01 21:47:55 -06:00
Benoit Boissinot
83a68d580f
merge with backout
2006-10-31 13:03:23 +01:00
Benoit Boissinot
3f2046d235
Backed out changeset 0fc94973be4ffeb0b5ace8a920dec676a9a51130
2006-10-31 13:02:49 +01:00
Benoit Boissinot
b8176cb795
use workingcontext.files() to detect if the repo is unclean
2006-10-29 14:18:55 +01: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
Thomas Arendsen Hein
687e4a7111
Define and use nullrev (revision of nullid) instead of -1.
2006-10-29 10:53:51 +01:00
Matt Mackall
785d7f44cb
merge: fix branch setting
...
(and remove debugging message)
2006-10-17 22:59:01 -05:00
Matt Mackall
8c602e592a
imported patch foo
2006-10-17 22:34:43 -05:00
Matt Mackall
384f4460ac
merge: if filemerge skips merge, report as updated
2006-10-15 16:18:09 -05:00
Matt Mackall
492924b1a5
merge: update dirstate correctly for non-branchmerge updates
...
- we don't actually need the context in recordupdates
- use -1 for filesize to force check on normal update
- only record copy for branchmerges
- forget moved files on update
2006-10-13 17:58:04 -05:00
Matt Mackall
4d37ff4a92
merge: turn followcopies on by default
2006-10-12 14:49:19 -05:00
Matt Mackall
fef0705ae8
merge: pull user messages out to hg.py
...
- add _update for shadowing in clone
- add _showstats helper
- remove update parameter defaults
- move stats message and merge help messages
2006-10-10 03:39:44 -05:00
Matt Mackall
47200ceb34
merge: update some docstrings
2006-10-10 02:31:02 -05:00
Matt Mackall
2e860ba70d
merge: various tidying
...
update tests to handle corrected output and new workingctx display
2006-10-10 02:15:20 -05:00
Matt Mackall
285d3e6b86
merge: use contexts in checkunknown and forgetremoved
2006-10-10 01:43:58 -05:00
Matt Mackall
41f0942fa0
merge: shortcircuit filemerge for identical files
...
- use filectx.cmp to compare files
- move merge messages into filemerge
- kill the redundant resolving message
- update tests
2006-10-10 01:16:06 -05:00
Matt Mackall
d2113ca490
merge: pull file copy/move out of filemerge
2006-10-10 00:54:00 -05:00
Matt Mackall
8df16edc62
merge: unify merge and copy actions
2006-10-10 00:41:55 -05:00
Matt Mackall
03952b0c2d
merge: swap file and mode args for act()
2006-10-10 00:32:30 -05:00
Matt Mackall
12fd359e4a
merge: finish removing nodes from action list
2006-10-10 00:22:03 -05:00
Matt Mackall
642329c803
merge: eliminate nodes from action list
...
- eliminate my and other from merge and copy
- eliminate node from get
- use mctx for get
- fix bug flag = a[2:]
- pass mctx to recordupdates
- use new filectx.size in recordupdates
2006-10-09 23:23:25 -05:00
Matt Mackall
3acfbeaf4c
filemerge: use contexts rather than my and other
2006-10-09 21:27:04 -05:00
Matt Mackall
598b522a75
merge: pass contexts to applyupdates
2006-10-09 20:32:03 -05:00
