Commit Graph

89567 Commits

Author SHA1 Message Date
mpm@selenic.com
7c6f4b49c8 Add tag support 2005-05-13 13:12:32 -08:00
mpm@selenic.com
d9094f35ef Fix up a bunch of bugs in the new merge code
Move getchangegroup/addchangegroup to generators
2005-05-13 11:47:16 -08:00
mpm@selenic.com
264f689db9 Diff in subdirectories from Jake Edge
Dates in diff
Fix O(n^2) behaviour of manifest diff
Add a/ and b/ to work with patch -p1
2005-05-12 17:54:55 -08:00
mpm@selenic.com
b3f6fa6d57 Minor changes for release 0.4e 2005-05-12 01:23:51 -08:00
mpm@selenic.com
c9c30d5cbd Fix tabs
Update version number
Set new merge as the default
2005-05-12 01:23:26 -08:00
mpm@selenic.com
b0bceb7849 Add server side of hg:// protocol to hgweb 2005-05-12 01:22:37 -08:00
mpm@selenic.com
f6de60c79e Add hg:// protocol
Fix some of the getchangegroup logic
2005-05-12 01:21:58 -08:00
mpm@selenic.com
0de42f16b1 Minor corrections 2005-05-12 01:20:43 -08:00
mpm@selenic.com
ee0a1f1ebc A quick set of comparisons between hg, git, and bk 2005-05-12 01:20:16 -08:00
mpm@selenic.com
8c8eaff980 hgweb.py from Jake Edge
remove hgweb.py from URLs so that it will work as index.cgi
2005-05-11 17:11:10 -08:00
mpm@selenic.com
27770f7f5d Add getchangegroup code to efficiently calculate and request a changegroup 2005-05-11 15:06:41 -08:00
mpm@selenic.com
1171a0a7b6 From: Thomas Arendsen Hein <thomas@intevation.de>
Good. Attached is a patch which also tries to use $EMAIL as the
commit user and removed a try/except by using os.environ.get.
2005-05-11 14:38:26 -08:00
mpm@selenic.com
adf63c64ab Fix lsdiff filtering 2005-05-11 14:37:23 -08:00
mpm@selenic.com
60e614139c Drop empty lines from lsdiff 2005-05-11 14:36:17 -08:00
mpm@selenic.com
f8eae9eb87 Strip trailing spaces from lsdiff file list 2005-05-11 14:34:31 -08:00
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