Commit Graph

64 Commits

Author SHA1 Message Date
jake@edge2.net
ebfa981ca0 add export, recover, and undo to the man page
add export to hg help
2005-05-30 09:53:48 -07:00
mpm@selenic.com
a1cf98772e Bump the version number to 0.5b for the protocol change
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Bump the version number to 0.5b for the protocol change

manifest hash: a7930fa15b716eb90613bd761b47c27331ea4b8b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCmz7pywK+sNU5EO8RAt7dAJ4qmUpDRS7/JP/JpLm8uXZ0c+5W/ACfVb0Q
99rjYslSjJfOWYLCKiAzVyU=
=WVVg
-----END PGP SIGNATURE-----
2005-05-30 08:27:21 -08:00
mpm@selenic.com
55d14e5d8d Changes to network protocol
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Changes to network protocol

Stream changes at the delta level rather than at whole delta groups
 this breaks the protocol - we now send a zero byte delta to indicate
 the end of a group rather than sending the entire group length up front
Fix filename length asymmetry while we're breaking things
Fix hidden O(n^2) bug in calculating changegroup
 list.append(e) is O(n), list + [element] is not
Decompress chunks on read in revlog.group()
Improve status messages
 report bytes transferred
 report nothing to do
Deal with /dev/null path brokenness
Remove untriggered patch assertion

manifest hash: 3eedcfe878561f9eb4adedb04f6be618fb8ae8d8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCmzlqywK+sNU5EO8RAn0KAJ4z4toWSSGjLoZO6FKWLx/3QbZufACglQgd
S48bumc++DnuY1iPSNWKGAI=
=lCjx
-----END PGP SIGNATURE-----
2005-05-30 08:03:54 -08:00
mpm@selenic.com
c83432e669 Mercurial 0.5
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Mercurial 0.5

Update version numbers
Fixup MANIFEST.in

manifest hash: 58db9be35685e83133f20e96265d6c434fc106c2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCmOwHywK+sNU5EO8RAq0OAKCkMWzSMzhisTFBmT2WLj2bf+PMqwCbBv+S
jNvqIQsru2JMdCQC2eG7CxU=
=c20j
-----END PGP SIGNATURE-----
2005-05-28 14:09:11 -08:00
mpm@selenic.com
854199ca61 hg: remove some debug commands, improve help messages, add .hgpaths file
.hgpaths is a file with lines of the form:

<symbolic name> <repository path or url>

that allows you to do:

hg merge <name>
2005-05-26 23:39:42 -08:00
mpm@selenic.com
759ec3f6bf hg merge: abort if there are outstanding changes in the working directory
We currently don't support merging from the tip into the working
directory, so merge with outstanding local changes is asking for
trouble.
2005-05-26 22:54:48 -08:00
mpm@selenic.com
f86593199d Make undo and recover friendlier
Add them to the help display, have them report failure
2005-05-26 09:48:50 -08:00
mpm@selenic.com
683f21be6a Implement recover and undo commands
This adds an interface to transaction to rollback with a given journal file
and commands to rollback an existing .hg/journal or .hg/undo.
2005-05-26 09:04:54 -08:00
mpm@selenic.com
7bd4038f51 Add 'hg serve' command for stand-alone server
This adds a simple stand-alone web server mode to hg that exports the
current repo for merging and browsing. The default port is 8000.
2005-05-25 16:27:10 -08:00
mpm@selenic.com
33b3059287 Add options to annotate for user/rev/changeset
This eliminates the blame command and makes annotate more flexible.
2005-05-25 08:53:01 -08:00
mpm@selenic.com
1bdc9f0c42 Minor fixes to verify 2005-05-24 20:29:38 -08:00
mpm@selenic.com
e4397937b5 Prettify the web interface
Add header, footer templates
Add null parent handling
Combine files and directories
Add parity flag for alternating line colors
Add line numbers to filerevision
2005-05-23 20:57:48 -08:00
mpm@selenic.com
6ff7eab053 Make hg diff handle files that have been added but not yet committed. 2005-05-21 17:26:44 -08:00
mpm@selenic.com
ffa51818f8 Fix diff and export not showing added files 2005-05-21 17:03:12 -08:00
mpm@selenic.com
c60061b78a Remove debugoldmerge command 2005-05-20 17:47:13 -08:00
mpm@selenic.com
04245ab9dc hg history: don't print file list without -v switch 2005-05-20 17:46:47 -08:00
mpm@selenic.com
3ede7375ba Subdir support for annotate 2005-05-20 17:45:03 -08:00
mpm@selenic.com
d35617bec8 Use revlog.delta and mdiff.patchtext to massively speed up processing
of manifests. This lets us verify a 28k changeset kernel repo in under
two minutes.
2005-05-20 17:44:34 -08:00
mpm@selenic.com
aea9850302 Make prompting go
Minor UI tweaking
Add merge prompting
2005-05-18 18:25:37 -08:00
mpm@selenic.com
3157c9afd4 Don't diff unknown files
Fix syntax error from log date
2005-05-18 17:37:49 -08:00
mpm@selenic.com
b5d9923ebe Date on its own line in file log 2005-05-18 17:33:46 -08:00
mpm@selenic.com
b4850f98ce Pull from hg://edge2.net/hg/cmds 2005-05-18 17:29:10 -08:00
mpm@selenic.com
adaab3fa84 Fix two bugs in verify 2005-05-18 15:24:18 -08:00
mpm@selenic.com
72b94a4566 Add debugindexdot to generate graphviz dot files from indexes 2005-05-18 15:23:10 -08:00
mpm@selenic.com
2e36d7a3ac hack so that debugindex takes filenames 2005-05-18 15:21:53 -08:00
mpm@selenic.com
a629b713fd Add tip command 2005-05-17 13:37:15 -08:00
mpm@selenic.com
2502163da9 Missing newline in "requesting changegroup" 2005-05-17 12:40:24 -08:00
mpm@selenic.com
1ecdf27a90 Verify improvements:
Check existence of parents of changesets and manifests
  Count errors
  Use ui for display
  Catch and count unpack exceptions
  Print error count and exit with non-zero status on error
2005-05-17 12:23:53 -08:00
mpm@selenic.com
77028dbcc6 Add -q quiet option
Make -d and -v do something
Add a bunch of debug and note messages
2005-05-17 11:06:59 -08:00
mpm@selenic.com
fc7853852c Add annotate and blame to the command list and README 2005-05-17 01:27:14 -08:00
mpm@selenic.com
9d9ba28260 Fix field width for annotate
Add blame
2005-05-17 01:22:50 -08:00
mpm@selenic.com
08e7e95781 Add basic annotation support
filelog.annotate() will get the change number on each line.

Singed-Off-by: Christopher Li<hg@chrisli.org>
2005-05-17 01:12:30 -08:00
mpm@selenic.com
33cd8991ff 2005-05-17 00:30:01 -08:00
jake@edge2.net
7d30503ba4 adding subdir support for log and status commands 2005-05-15 15:30:36 -07:00
mpm@selenic.com
45dc65620e Fix debugindex formatting for large repos 2005-05-14 10:13:49 -08:00
mpm@selenic.com
ef064442c8 Minor changes to import so that we can successfully import Ingo's
kernel history patchset.
2005-05-13 18:22:08 -08:00
mpm@selenic.com
23ab34a17a Print changeset metadata for export 2005-05-13 13:26:00 -08:00
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
c9c30d5cbd Fix tabs
Update version number
Set new merge as the default
2005-05-12 01:23:26 -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
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
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
8bd85e1add Add changegroup support 2005-05-10 00:40:49 -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