Commit Graph

52 Commits

Author SHA1 Message Date
mpm@selenic.com
507be67a72 Ignore .orig and .rej files from patch 2005-05-11 14:32:03 -08:00
mpm@selenic.com
f3aea374ef Add -q option to import
Make import complain if patching fails
2005-05-11 14:06:34 -08:00
mpm@selenic.com
779e631cfb Import comments from patches 2005-05-11 13:56:22 -08:00
mpm@selenic.com
40a6faf20b Fix resolve bug putting unchanged files in resolve cset 2005-05-11 09:44:12 -08:00
mpm@selenic.com
9b705e8c55 Rollback is implemented 2005-05-10 23:33:19 -08:00
mpm@selenic.com
8bd85e1add Add changegroup support 2005-05-10 00:40:49 -08:00
mpm@selenic.com
22ff07bd9b Fix recursion depth trouble with ancestor algorithm 2005-05-10 00:34:57 -08:00
mpm@selenic.com
af712781e7 Fix occassional diff bug with manifests 2005-05-10 00:33:48 -08:00
mpm@selenic.com
60afa3551c Attempt to recover journal automatically 2005-05-10 00:32:05 -08:00
mpm@selenic.com
97820ba3c6 Fix multiple changes to file per transaction 2005-05-10 00:31:00 -08:00
mpm@selenic.com
9bc9418a12 Fix truncate logic for indices again 2005-05-07 16:33:31 -08:00
mpm@selenic.com
c99659b446 Date is an int as a string in changelog 2005-05-07 16:33:09 -08:00
mpm@selenic.com
d2ba18c0da Add lookup smarts everywhere
Fix import command
2005-05-07 16:32:31 -08:00
mpm@selenic.com
1f2a5fcdf0 Add improved rev lookup to diff and export 2005-05-07 16:13:26 -08:00
mpm@selenic.com
90b1458af6 Move hex/bin bits to revlog
Handle lookup of rev -1 of changelog
2005-05-07 16:12:31 -08:00
mpm@selenic.com
8e1b58ff84 Add smart node lookup by substring or by rev number 2005-05-07 16:11:36 -08:00
mpm@selenic.com
e10ce18d5b unidiff: punt on comparing empty files 2005-05-07 16:10:50 -08:00
mpm@selenic.com
fcc670c825 Add export command 2005-05-07 11:37:28 -08:00
mpm@selenic.com
ec57dd3c61 Support for 0, 1, or 2 diff revs 2005-05-07 09:27:52 -08:00
mpm@selenic.com
6d687f705b Add diffrevs function to compare two nodes 2005-05-06 09:09:35 -08:00
mpm@selenic.com
01134c785a diffdir tidy in preparation for arg handling 2005-05-05 15:22:11 -08:00
mpm@selenic.com
daf47e9d59 Fix up commit arg breakage 2005-05-05 15:20:56 -08:00
mpm@selenic.com
e36ca808fb Make diffdir take a revision argument 2005-05-05 15:05:50 -08:00
mpm@selenic.com
329be359b7 Add some tests to the repo 2005-05-04 22:57:51 -08:00
mpm@selenic.com
de2f3d3af8 hg co after hg merge 2005-05-04 22:57:16 -08:00
mpm@selenic.com
cd521a6348 Simplify integrity checking
More fiddling with transaction truncate points (still untested)
2005-05-04 22:51:25 -08:00
mpm@selenic.com
fc0d37860b Fix corruption from manifest.listcache optimization
Put the remove edit text in the right place
2005-05-04 22:47:25 -08:00
mpm@selenic.com
b9dbea8b13 Add debughash and debugindex commands 2005-05-04 22:45:52 -08:00
mpm@selenic.com
de51831199 Import time for hg history command 2005-05-04 17:27:08 -08:00
mpm@selenic.com
0fc63bb561 Document diff in help
Add filenames to diff support
2005-05-04 17:26:27 -08:00
mpm@selenic.com
faafbc68f8 Show date in history 2005-05-04 17:19:02 -08:00
mpm@selenic.com
1fb1f1ae9a The actual hg remove fix from Thomas Hein 2005-05-04 15:42:30 -08:00
mpm@selenic.com
1e4e38aea7 From: Thomas Arendsen Hein <thomas@intevation.de>
mercurial 0.4d had the same problems with removing files, but
attached is a patch which fixes that problem.

The key change is in dircache.remove():
 del self[f] should have been del self.map[f]

This error was hidden by the 'except: pass' statement.
2005-05-04 15:32:16 -08:00
mpm@selenic.com
9a01e9d6d9 Give a friendlier message when repo isn't found 2005-05-04 11:01:17 -08:00
mpm@selenic.com
3f265ea3b1 Make hg verify do more thorough cross-checking. 2005-05-04 10:50:21 -08:00
mpm@selenic.com
cf2b4974c2 Update version numbers 2005-05-04 10:07:28 -08:00
mpm@selenic.com
e35c6e552f Fix network pull of repo files with "%" in their base64 encoding. 2005-05-04 10:07:10 -08:00
mpm@selenic.com
070c0db3c5 Fix off-by-one truncation in transaction rollback. 2005-05-04 09:33:46 -08:00
mpm@selenic.com
89e337b327 Fix empty transaction destruction 2005-05-04 09:32:39 -08:00
mpm@selenic.com
78a55d241c Delete journal on destruction even if there are no entries to replay. 2005-05-04 09:30:56 -08:00
oxymoron@cinder.waste.org
3bf73d4562 Allow checkout by number or hash
Print files touched in changeset
Fix reporting of incorrect changelog rev links in verify
2005-05-03 23:39:04 -08:00
oxymoron@cinder.waste.org
c7e0bb4f93 Fix linking of changeset revs when merging 2005-05-03 23:37:43 -08:00
mpm@selenic.com
b713cdf587 Ignore empty ignore patterns 2005-05-03 18:51:52 -08:00
mpm@selenic.com
4c67396819 Ignore MANIFEST 2005-05-03 18:51:29 -08:00
mpm@selenic.com
e64cf46965 Add MANIFEST.in to repo 2005-05-03 18:51:16 -08:00
mpm@selenic.com
386c928b37 Add some ignore expressions 2005-05-03 18:50:07 -08:00
mpm@selenic.com
ddd6a61c95 Don't complain that help is an unknown command 2005-05-03 18:39:58 -08:00
mpm@selenic.com
45bf6cd115 Fix exception handling for reading current working version 2005-05-03 18:36:16 -08:00
mpm@selenic.com
c99cd3d6ad Ignore build/ and .pyc files 2005-05-03 18:35:26 -08:00
mpm@selenic.com
62cccd42a6 Handle nullid better for ancestor 2005-05-03 18:35:03 -08:00