mpm@selenic.com
0c92a53dcc
Fix two minor merge bugs
...
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix two minor merge bugs
Fix variable name for printing manifest node
Trouble with empty between lists from remote repos
manifest hash: 000e9267b17c870f673210c8aae50d99e0e5b72b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCmOmtywK+sNU5EO8RAs7AAJ9dVyOn5Ne+EopdUqOe8IKVH86R3wCfUhNO
CLpuRURCB5Ang19YZ5MLGeg=
=NF1T
-----END PGP SIGNATURE-----
2005-05-28 13:59:09 -08:00
mpm@selenic.com
68acd15143
Add $HGEDITOR hook and example script
...
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Add $HGEDITOR hook and example script
This hook makes signing commits easier.
manifest hash: ba8723e4b52323528dfa681a58658a5b4b2c02e4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCmONFywK+sNU5EO8RAj87AKCEa5r9EepdYPiYRGo/jAjjwCIcVACfeBPe
QDInXr7karo6/P8d2bM/tVU=
=rxIQ
-----END PGP SIGNATURE-----
2005-05-28 13:31:49 -08:00
mpm@selenic.com
868bdf2214
Add manifest hash to commit messages for easy signing
...
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Here's an example:
This is the current manifest hash:
e06d11165178d03c296ea7e7854f91e612a8d6bf
It was copied from the HG: comment lines that are added to the commit.
Then I wrote this commit message, signed it, then closed the commit.
The manifest hash is a hash of all the files in the project together
with the hashes of manifest's parents. Thus, signing the manifest hash
allows us to verify the entire state of project at the time of the
commit.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCmMrcywK+sNU5EO8RAoKwAJ4gPz2dI1Xh44N3tra43clUGhLVggCbBxuu
8pBZt85SA9ty39+e2+hL9WI=
=t/xS
-----END PGP SIGNATURE-----
2005-05-28 11:48:00 -08:00
mpm@selenic.com
b43cebfe40
Improved binary diff from Christopher Li
...
This is more intelligent/efficient by combining neighboring inserts,
replaces and deletes. Passes test of converting kernel repo, but
doesn't appear to substantially affect compression or performance.
2005-05-27 19:38:34 -08:00
mpm@selenic.com
dbf12abbe4
hgweb: Sort tags by revision number
2005-05-27 13:30:35 -08:00
mpm@selenic.com
7d17d1db0c
Pull from Jake's hg docs
2005-05-27 13:09:56 -08:00
jake@edge2.net
96e811557f
updated for .hgpaths and http/old-http protocol name change
2005-05-27 14:09:43 -07:00
mpm@selenic.com
9a234b70ad
hgweb: Fix navigate to 0 bug
2005-05-27 12:45:41 -08:00
mpm@selenic.com
bb5af0e7a3
Add ~/.hgpaths to README
2005-05-27 12:42:52 -08:00
mpm@selenic.com
2bf41c300e
Merge from Jake's hg docs
2005-05-27 12:27:46 -08:00
mpm@selenic.com
57a99c80af
Change hg: protocol name to http: and http: to old-http:
...
hg: will continue to work for a bit
old-http: will be phased out soon
2005-05-27 12:26:14 -08:00
jake@edge2.net
ce9abb65f6
adding doc directory and files
2005-05-27 07:16:58 -07: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
d5d19174b2
hgweb: make navigation of changesets a bit nicer
2005-05-26 22:47:43 -08:00
mpm@selenic.com
1dd7e5c920
hgweb: alternating colors for multifile diffs
2005-05-26 20:37:05 -08:00
mpm@selenic.com
3d6a44cc6c
trivial tweak to merge3
2005-05-26 18:20:24 -08:00
mpm@selenic.com
59375bb06a
hg diff: fix missing final newline bug
2005-05-26 13:02:28 -08:00
mpm@selenic.com
bea0b877e3
hgweb: actually commit the tags template
2005-05-26 13:02:04 -08:00
mpm@selenic.com
546aa0fdbb
hgweb: add tags links and manifest links
...
This adds a simple new tags page to browse by tag, adds the tag link
everywhere, and adds manifest links to the tags and changelog pages.
2005-05-26 12:24:01 -08:00
mpm@selenic.com
e687fa3c97
Hide most revision numbers in hgweb
2005-05-26 11:15:05 -08:00
mpm@selenic.com
474171f31c
hgweb: don't blow up on search for unknown keys
2005-05-26 10:11:05 -08:00
mpm@selenic.com
7ac7091e05
Add tag/rev/node search to hgweb
2005-05-26 10:08:47 -08:00
mpm@selenic.com
9be61ee466
Make fancyopts handle no arguments
...
This lets hg serve work with no args.
2005-05-26 09:56:20 -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
0058e326b8
Simply repository locking
...
This is a first pass at implementing repo locking. Next up, journal
recovery and undo.
2005-05-26 08:53:04 -08:00
mpm@selenic.com
0ccf847c00
Update the README a bit
2005-05-25 16:40:22 -08:00
mpm@selenic.com
970955c99d
Add example CGI script
...
This gives an example of how to easily use hgweb via CGI
2005-05-25 16:28:23 -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
949217673f
Install the templates where they can be found by hgweb.py
...
This ought to use package_data but that doesn't exist in Python 2.3.
So we do a hack of install_data and use glob.
This also adds templatepath() to hgweb.py which finds the templates
relative to hgweb.py's location.
2005-05-25 16:21:06 -08:00
mpm@selenic.com
2424ff846c
Fix some broken parent links in hgweb
2005-05-25 09:04:38 -08:00
mpm@selenic.com
7400685c33
Merge from hgweb
2005-05-25 08:54:54 -08:00
mpm@selenic.com
34f1196e86
Bail on attempts to do an empty commit
2005-05-25 08:53:34 -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
a9d4acea6a
Pass filename to $HGMERGE
...
This lets the merge program be slightly more user-friendly
2005-05-24 23:34:06 -08:00
mpm@selenic.com
0616f6d8db
Improve pruning of branches in outstanding changeset algorithm
...
These changes make the client keep track of what it's seen more
carefully to avoid some redundant requests.
2005-05-24 23:13:25 -08:00
mpm@selenic.com
dba1a9fc73
A new ancestor algorithm
...
The old ancestor algorithm could get fooled into returning ancestors
closer to root than it ought to. Hopefully this one, which strictly
orders its search by distance from room, will be foolproof.
2005-05-24 23:11:44 -08:00
mpm@selenic.com
cbe151d218
Handle merge with deletions
...
If you merge with a repo that has deleted a file after editing it, hg
attempted to resolve the file. This (correctly) resulted in hg verify
errors because the resolved version didn't show up in the manifests.
This moves the manifest resolution before file resolution and decides
which files to resolve based on the (partially) resolved manifest.
After files are resolved, the final manifest is committed.
2005-05-24 20:30:35 -08:00
mpm@selenic.com
1bdc9f0c42
Minor fixes to verify
2005-05-24 20:29:38 -08:00
jake@edge2.net
579f538a2d
fixed problem with head/body tags, added dtd, fixed table attributes
...
add quotes around all attributes (w3c recommendation)
pages pass w3c validator
2005-05-24 16:08:09 -07:00
jake@edge2.net
8778053fe5
changed pos to rev for changelog cmd, changed & to ;
2005-05-24 07:42:05 -07:00
jake@edge2.net
1802614df3
hgweb is no longer a script
2005-05-24 07:33:12 -07:00
mpm@selenic.com
a2b716acff
Fix transaction handling bug by reverting fileopener change
2005-05-23 22:14:41 -08:00
mpm@selenic.com
27835c58e5
Fix pos in navbar
...
Fix bad parent link in changelog
2005-05-23 21:15:36 -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
12c3bda8c3
Simple script to recompress a log file
2005-05-23 16:06:25 -08:00
mpm@selenic.com
84eb10c391
Minor safety checks to manifest diff
2005-05-23 16:05:48 -08:00
mpm@selenic.com
75fe869ada
Minor updates to comparison
2005-05-23 16:05:05 -08:00
mpm@selenic.com
61d83d35a2
Revamped templated hgweb
2005-05-23 16:00:02 -08:00