Thomas Arendsen Hein
f0c446ce6e
Make sequence number on hg export start at 1 (as documented for %n). Add test.
2006-12-15 19:09:10 +01: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
Alexis S. L. Carvalho
7781594dc0
handle files with more than one git binary patch
2006-11-27 22:03:36 -02:00
Alexis S. L. Carvalho
b0141a470e
handle files with both git binary patches and copy/rename ops
2006-11-27 22:03:31 -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
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
Thomas Arendsen Hein
411d64ce3e
white space and line break cleanups
2006-11-17 08:06:54 +01:00
Matt Mackall
0cc86247a3
util: add copyfile function
2006-11-13 13:26:57 -06:00
Brendan Cully
803c7dd950
git patch: create empty added files
2006-10-30 16:10:58 -08:00
Alexis S. L. Carvalho
18fea415ad
add untrusted argument to patch.diffopts
2006-10-26 19:25:45 +02:00
Benoit Boissinot
3f09dfef56
use xrange instead of range
2006-10-19 14:16:51 +02:00
Brendan Cully
c3df18d34b
patch: return list of modified files even when an exception is raised
...
The file list is passed in as an argument and updated in place.
This fixes issue399.
2006-10-18 10:37:34 -07:00
Alexis S. L. Carvalho
38eb833dca
use short hashes with diff -v
2006-10-13 15:34:35 -03:00
Brendan Cully
2b2122f24a
Add popen2 demandload to patch.py, required by diffstat
2006-10-12 16:34:32 -07:00
Brendan Cully
490357d105
Use line length field when extracting git binary patches
2006-10-12 13:39:14 -07:00
Brendan Cully
59b9d3d043
Add git-1.4 binary patch support
2006-10-12 09:17:16 -07:00
Brendan Cully
2b9e1a5fbd
Don't generate git diff header for empty diffs
2006-10-10 14:48:26 -07:00
Benoit Boissinot
b58f394b3c
fix warnings from pychecker
2006-10-02 21:10:31 +02:00
Thomas Arendsen Hein
0a7b982aa6
Whitespace/Tab cleanup
2006-10-01 19:26:33 +02:00
Stephen Darnell
a808384cf1
Add -D/--nodates options to hg diff/export that removes dates from diff headers
...
and replace uses of sed in the tests with --nodates.
2006-09-26 00:05:24 +01:00
Benoit Boissinot
a952c24cfd
fix users of dirstate.copies broken by 2f0cc26377ab
2006-09-26 13:58:58 +02:00
Matt Doar
223e5f58eb
Add support for diffstat in commit emails, and move diffstat from
...
patchbomb to patch
2006-09-13 13:14:08 -07:00
Benoit Boissinot
670858c395
git --diff: fix traceback when getting mode change
...
- use the manifest instead of the mode in the working dir
if the diff is against two revisions
- add a testcase
2006-09-07 14:12:39 +02:00
Benoit Boissinot
c0b915f6a5
unlink temporary patch files even when an exception is raised
2006-09-05 01:11:14 +02:00
Brendan Cully
5d3521d32c
Remove temporary git patch files
2006-08-30 13:42:57 -07:00
Brendan Cully
955a275a1c
Fix git patch application when cwd != repo.root
2006-08-30 13:12:26 -07:00
Vadim Gelfer
0d5df3aaf3
merge.
2006-08-18 17:02:38 -07:00
Giorgos Keramidas
a1e9b12e3d
add missing import of errno
2006-08-17 21:13:35 +03:00
Brendan Cully
16fb95a415
Teach mq about git patches
2006-08-16 19:49:45 -07:00
Brendan Cully
bbf7e4e798
Move import's working dir update code into patch.updatedir
2006-08-16 19:46:18 -07:00
Vadim Gelfer
9614f4bd5b
redo merge with mpm.
...
previous merge at 8c0343e3f2b7 was bad.
2006-08-16 10:52:19 -07:00
Brendan Cully
2709262462
Unify mq and hg patch invocation.
...
This makes patch a little less verbose by default, so the tests
had to be updated.
2006-08-15 11:28:50 -07:00
Matt Mackall
6ecbc46d1a
Move ui.diffopts to patch.diffopts where it belongs
2006-08-15 11:34:08 -05:00
Brendan Cully
c18265f47c
Add diff --git option
2006-08-14 22:48:03 -07:00
Vadim Gelfer
ed05627ce0
fix patch.patch.filterfiles.
...
now test-diff-subdir passes.
2006-08-13 15:24:30 -07:00
Vadim Gelfer
80d6f2f7c7
remove localrepository.changes.
...
use localrepository.status instead.
2006-08-12 16:40:12 -07:00
Vadim Gelfer
13d751feaf
refactor text diff/patch code.
...
rename commands.dodiff to patch.diff.
rename commands.doexport to patch.export.
move some functions from commands to new mercurial.cmdutil module.
turn list of diff options into mdiff.diffopts class.
patch.diff and patch.export now has clean api for call from 3rd party
python code.
2006-08-12 16:13:27 -07:00
Vadim Gelfer
57aab63e91
util: qualify name properly.
2006-08-12 15:41:26 -07:00
Vadim Gelfer
beb26e5257
commands.import: refactor patch parsing into patch.extract.
2006-08-12 13:16:48 -07:00
Vadim Gelfer
2eab8e108e
merge git patch code.
2006-08-12 12:47:18 -07:00
Brendan Cully
81f4208ee0
Remove debugging line
2006-08-11 16:55:48 -07:00
Brendan Cully
4f1b3a83bb
Move patch-related code into its own module.
2006-08-11 15:50:16 -07:00
