Commit Graph

821 Commits

Author SHA1 Message Date
chad.netzer@gmail.com
899bc83dfc Make consistent use of str.startswith() in conditionals.
# HG changeset patch
# User chad.netzer@gmail.com
# Node ID 45db196de89a15fd045cd789f701b0180fd276f1
# Parent  852adf9ffa4dd2cb1a504bd207f0cad178ac4024
Make consistent use of str.startswith() in conditionals.
2005-07-10 16:14:56 -08:00
Andrew Thompson
544875fe3b Change MANIFEST.in to recursive-include the contrib/ folder.
# HG changeset patch
# User Andrew Thompson <andrewkt@aktzero.com>
# Node ID e5dc09266c217bc50b91d710a045c679411e4727
# Parent  c55df1c38618035c8e94e7af025e2b7f38f6d743
Change MANIFEST.in to recursive-include the contrib/ folder.
Now sdist picks up git-viz again.
2005-07-10 16:14:41 -08:00
Edouard Gomez
1a4ff4aee9 More IE friendly diff output related templates.
# HG changeset patch
# User Edouard Gomez <ed.gomez@free.fr>
# Node ID 6eee9b54c53c41643192c7920db642c984a00a21
# Parent  25ad877710029dfa51e14ac88ff498cf0a98c0f2
More IE friendly diff output related templates.

I thought i could use CSS to render properly the diff blocks in IE.
But i was obviously too optmistic and didn't realized that IE only
renders preformated text for pre tag content...

So i had to rollback some of my changes to accomodate to this IE
bug/limitation. A diff blocks become pre tags, and diff lines
become span again. Hopefully, the pages continue validating.
2005-07-10 16:14:28 -08:00
Bryan O'Sullivan
a2873f02e1 Move hgrc documentation out to its own man page, hgrc(5).
# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Node ID 5076cf1fd6a1b8eb410e5e03cb004ca6a52a30f9
# Parent  d5198e5dd8087ca487031662f0908a6296512e5d
Move hgrc documentation out to its own man page, hgrc(5).
The new man page expands on the existing documentation by describing
the file format and the purpose of each section and field.
2005-07-10 16:14:06 -08:00
Matt Mackall
5fb8ca60d2 Move .hg into ignore() 2005-07-10 16:13:39 -08:00
mwilli2@localhost.localdomain
f2f576fe2c .hgignore speedups patch incorporating Matt's feedback.
# HG changeset patch
# User mwilli2@localhost.localdomain
# Node ID c78a9d4398c63b6bc689e456e1cab3850a846c8a
# Parent  5155a0b6300820be38eb7e04d26525be39307df2
.hgignore speedups patch incorporating Matt's feedback.
2005-07-10 16:03:20 -08:00
Edouard Gomez
5195263115 Dont trap SIGHUP on the other OS
# HG changeset patch
# User Edouard Gomez <ed.gomez@free.fr>
# Node ID 34a547cb33fe515ef4cdc8ccd173546671253ae9
# Parent  5155a0b6300820be38eb7e04d26525be39307df2
Dont trap SIGHUP on the other OS

HG doesn't work anymore on the other OS since signals are trapped.

This is due to the fact that as explained in Python docs not all
signals are defined for all platforms, so python was complaning about
missing signal.SIGHUP.
2005-07-10 16:02:39 -08:00
mark.williamson@cl.cam.ac.uk
7d47f35832 A number of minor fixes to problems that pychecker found.
# HG changeset patch
# User mark.williamson@cl.cam.ac.uk
# Node ID 55d38977b7f2e73b8c1090179928ac96c8922b90
# Parent  0bda45294416406d4c6fbaf1cb643dd0bf6b3a16
A number of minor fixes to problems that pychecker found.
2005-07-10 16:01:11 -08:00
Radoslaw "AstralStorm" Szkodzinski
3a46ae804a hgeditor: Remove EMAIL default for HGUSER, comment editor selection
# HG changeset patch
# User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
# Node ID a4c688c8273e392b1bf33cfc736e00ec752a415e
# Parent  be12687d4bf0ce16c4207bef85c188de66efbf53
hgeditor: Remove EMAIL default for HGUSER, comment editor selection

HGUSER is already set to EMAIL by Python code if needed
2005-07-10 16:00:56 -08:00
Radoslaw "AstralStorm" Szkodzinski
20c9bc8998 hgeditor: Remove temporary files even if interrupted
# HG changeset patch
# User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
# Node ID 1292f1fd015767d9682ba2ff5f8377fb6760c3a5
# Parent  a4c688c8273e392b1bf33cfc736e00ec752a415e
hgeditor: Remove temporary files even if interrupted

Index: hg/hgeditor
===================================================================
2005-07-10 16:00:49 -08:00
Radoslaw "AstralStorm" Szkodzinski
4ca432b9b9 hgeditor: Simplify manifest hash adding
# HG changeset patch
# User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
# Node ID be12687d4bf0ce16c4207bef85c188de66efbf53
# Parent  341d27f865903223f8bf12382e3596167228a1c1
hgeditor: Simplify manifest hash adding

I hope no one will miss the colon.
2005-07-10 16:00:30 -08:00
Radoslaw "AstralStorm" Szkodzinski
df02adee87 hgeditor: Fix some parameters to commands
# HG changeset patch
# User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
# Node ID 341d27f865903223f8bf12382e3596167228a1c1
# Parent  5c5d1484b51a53918575a199ab8985160f0ce2d7
hgeditor: Fix some parameters to commands
2005-07-10 16:00:24 -08:00
Radoslaw "AstralStorm" Szkodzinski
f70194b3b9 Pass username to hgeditor, remove temporary file
# HG changeset patch
# User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
# Node ID 5c5d1484b51a53918575a199ab8985160f0ce2d7
# Parent  5155a0b6300820be38eb7e04d26525be39307df2
Pass username to hgeditor, remove temporary file
2005-07-10 16:00:17 -08:00
kreijack@inwind.REMOVEME.it
605fa025a7 Add rss tag in the changelog/filelog html template.
# HG changeset patch
# User kreijack@inwind.REMOVEME.it
# Node ID 20edcc82038fce8460076ca5723fbbb919016356
# Parent  5155a0b6300820be38eb7e04d26525be39307df2
Add rss tag in the changelog/filelog html template.
This patch add rss tags in the changelog/filelog template
html pages. This tags permit the browser to detect the rss feed.
2005-07-10 15:59:26 -08:00
Matt Mackall
2156cc914b Move commit hook after commit completes
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Move commit hook after commit completes

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

iD8DBQFC0ZwSywK+sNU5EO8RAuAjAJsHGTXsOCnxq+xbq/Q0H+ayGnzaiQCfdWn6
or+IWK3sjYILYncTxMFZJdE=
=mQb7
-----END PGP SIGNATURE-----
2005-07-10 14:07:14 -08:00
Matt Mackall
bc958d41d5 Whitespace cleanup
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Whitespace cleanup

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

iD8DBQFC0ZvmywK+sNU5EO8RAhhDAJ0YXOx5B2F/3NjFB+5YcUtkHqVyuQCgnNyp
tWbRrjDz/SbKz/tFAsxJDqo=
=xB66
-----END PGP SIGNATURE-----
2005-07-10 14:06:30 -08:00
Matt Mackall
c4c7a27643 Generate a friendlier except for failed lookups
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Generate a friendlier except for failed lookups

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

iD8DBQFC0Ws6ywK+sNU5EO8RArBGAJ9EA0mCNGqO+w6LaO358sVe19o7lQCdGffF
MmQ/ZIvxoJOjYTo+PLBWMqI=
=4VIg
-----END PGP SIGNATURE-----
2005-07-10 10:38:50 -08:00
Matt Mackall
2b45be3873 dirstate.forget() takes a list
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

dirstate.forget() takes a list

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

iD8DBQFC0WO+ywK+sNU5EO8RAlmYAJ9pcSgpvvuqLzfUkeApXZyOb3j6pQCgi9Te
e8ZI236WNWfyrwEASxFIeLM=
=yDVZ
-----END PGP SIGNATURE-----
2005-07-10 10:06:54 -08:00
Matt Mackall
9f4ad36efb Warn about bogus ignore expressions
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Warn about bogus ignore expressions

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

iD8DBQFC0IPqywK+sNU5EO8RAsOdAJ0bFxZoUjSk/BxWZ9C50SlxlDBlBQCeKbu0
QVzZZKIFlDRVWOsi8zfamHA=
=zAVL
-----END PGP SIGNATURE-----
2005-07-09 18:11:54 -08:00
Matt Mackall
bc0449b7fa Fix out of range regression
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Fix out of range regression

From: Filip Brcic <brcha@users.sourceforge.net>

The old revlog.py issued "index out of range" error when cloning the repository
Now I have reverted the parts of revlog.py to the old state when prev was
initialized as -1 and later assigned self.tip() only if that is possible.
Previously prev was always initialized as self.tip() and that is where the
out of range error was.

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

iD8DBQFCzzIxywK+sNU5EO8RAtlcAJ0TX9FXuC2c3YHuYXNwqZhdzPWUlgCggq+a
yJzUKDKH/gvnD3Tx3jcmCn8=
=euPi
-----END PGP SIGNATURE-----
2005-07-08 18:10:57 -08:00
Matt Mackall
23c3e09d30 Make cloning by hardlink quiet again
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Make cloning by hardlink quiet again

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

iD8DBQFCzvGGywK+sNU5EO8RAiCzAJ9iCRbyijLT7PqkgCI9eFn+9pl+KQCfdcB1
yHxfvLCL39wAAcBo6Hebpvo=
=qne+
-----END PGP SIGNATURE-----
2005-07-08 13:35:02 -08:00
Matt Mackall
7ad3935fdb Fix corruption resulting from skipping parts of a revision group
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Fix corruption resulting from skipping parts of a revision group

We were occassionally losing track of what revision a delta applied to
when we skipped over deltas we already had and applying the delta
against the wrong base. This could result in coredumps from mpatch,
consistency errors, or failed verify.

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

iD8DBQFCzu5SywK+sNU5EO8RAi10AJ9cqIfQzOzbcdH36t1LR/rY+UMtHwCeM79p
Dtv+Jh0McLZr6nf4iJyhDgI=
=5o6U
-----END PGP SIGNATURE-----
2005-07-08 13:21:22 -08:00
Matt Mackall
ad29857686 Non-grouping regex for ignore
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Non-grouping regex for ignore

Suggested by Mark Williamson

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

iD8DBQFCzjX3ywK+sNU5EO8RAnc1AJ4/sKzyZJiRs6UzE3uksE2U9rOkVQCeJsZf
PhHsNtEt/WyL+v44mBfk8Mk=
=e+Qy
-----END PGP SIGNATURE-----
2005-07-08 00:14:47 -08:00
Matt Mackall
ccd4188077 Fix an odd revlog bug
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Fix an odd revlog bug

If revlog had a cached -empty- revision, as opposed to no cached
version, it could get confused. This cropped up in verify on a
particular repo.

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

iD8DBQFCzjRaywK+sNU5EO8RAgVEAKCv3WBJt1rBOX0UlTDXFPygPIru+gCfTZxJ
CEz1lYny1gkQ+haGY26QdBs=
=C/K5
-----END PGP SIGNATURE-----
2005-07-08 00:07:54 -08:00
Matt Mackall
e4ed038d5b Fix bug in reverting deleted files
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Fix bug in reverting deleted files

Force updates and reverts wouldn't restore deleted files in the
working dir. This should fix that.

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

iD8DBQFCzjOJywK+sNU5EO8RAqVLAKCC1BF6JhNiO6n4LJGvy9RBTgOelwCdF9Tr
sADRnovYt9xSnUGmd1Om9JQ=
=SdcP
-----END PGP SIGNATURE-----
2005-07-08 00:04:25 -08:00
Matt Mackall
b9a708f99a Experimental ignore regex speed-up
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Experimental ignore regex speed-up

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

iD8DBQFCzWkvywK+sNU5EO8RAohzAJ9BwkFJQzs0QRH71r1Y1Wm0QCSmEwCgrESQ
Ej3Kt/y0JdhOJzQLsAiufqk=
=SPjY
-----END PGP SIGNATURE-----
2005-07-07 09:41:03 -08:00
Matt Mackall
cbe4c5f492 Attempt to read all remaining remote output at close
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Attempt to read all remaining remote output at close

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

iD8DBQFCzM60ywK+sNU5EO8RAudsAJwPW/MPUBXFV13UbYmZyiwdzSr8QwCfYJqc
l1ZDWPZPTN5UGUlfs0CCu7Y=
=2Tat
-----END PGP SIGNATURE-----
2005-07-06 22:41:56 -08:00
Matt Mackall
7c7855e82f update test-hup permissions
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

update test-hup permissions

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

iD8DBQFCzM2SywK+sNU5EO8RAnKvAKC1+ilD53KpBwplk5iaUMra4h3GDgCgsM4f
R+RswPBjW8I51vNyvZ45AvM=
=dQjV
-----END PGP SIGNATURE-----
2005-07-06 22:37:06 -08:00
Matt Mackall
d35c78a55f Show remote client output with "remote:" 2005-07-06 22:30:00 -08:00
kreijack@inwind.REMOVEME.it
42bbe1d4e5 this patch permits hgweb to show the deleted files in the changeset diff
# HG changeset patch
# User kreijack@inwind.REMOVEME.it
# Node ID 08b33970007e753f12b2b2f9d0e169981a6e8c3c
# Parent  d5198e5dd8087ca487031662f0908a6296512e5d
this patch permits hgweb to show the deleted files in the changeset diff
2005-07-06 22:28:50 -08:00
mason@suse.com
5cc69df211 Performance enhancements for manifest.add()
# HG changeset patch
# User mason@suse.com

Performance enhancements for manifest.add()

Improve manifest.add performance by using bisect to insert/remove
changed items into the manifest list.  This also generates the
manifest delta directly based on the changes being made.
2005-07-06 22:28:35 -08:00
Matt Mackall
b35386d135 typo in help message.
From: "Aneesh Kumar K.V" <aneesh.kumar@hp.com>
2005-07-06 22:27:53 -08:00
Matt Mackall
cc73c7d4df Update tests 2005-07-06 22:27:25 -08:00
Matt Mackall
66044de47d Catch SIGHUP
This should reduce the chance that a repo we're connected to via ssh
gets interrupted without doing rollback.
2005-07-06 22:27:07 -08:00
Matt Mackall
4a3866a379 Switch push over to the new scheme
Now push works transparently with any repo with lock and
addchangegroup. Currently this is local repos and ssh.
2005-07-06 22:25:40 -08:00
Matt Mackall
073fa93171 Add addchangegroup to the ssh protocol 2005-07-06 22:23:57 -08:00
Matt Mackall
8cf75f2dfd Add a scheme for handling remote locking
This adds an object that remembers to unlock the remote repo on
destruction and lock/unlock functions for the ssh protocol. The remote
repository should also unlock itself when the connection goes down.
2005-07-06 22:23:27 -08:00
Matt Mackall
46871ef83d Fix up the broken bits in findoutgoing 2005-07-06 22:21:23 -08:00
Matt Mackall
f8a8da4071 Move the empty changeset detection out of findincoming to pull
This lets us reuse findincoming for findoutgoing
2005-07-06 22:20:56 -08:00
Matt Mackall
e873216620 Protocol switch from using generators to stream-like objects.
This allows the the pull side to precisely control how much data is
read so that another encapsulation layer is not needed.

An http client gets a response with a finite size. Because ssh clients
need to keep the stream open, we must not read more data than is sent
in a response. But due to the streaming nature of the changegroup
scheme, only the piece that's parsing the data knows how far it's
allowed to read.

This means the generator scheme isn't fine-grained enough. Instead we
need file-like objects with a read(x) method. This switches everything
for push/pull over to using file-like objects rather than generators.
2005-07-06 22:20:12 -08:00
Matt Mackall
e16fdada85 Add a repo method to report repo device
This is used to establish whether repos are on the same device for
hard linking. Remote repos all return -1.
2005-07-06 22:14:10 -08:00
Matt Mackall
5405b88060 Slim down and update README a bit 2005-07-06 22:11:54 -08:00
thananck@yahoo.com
65554049c5 Provides output option to cat command
# HG changeset patch
# User thananck@yahoo.com
# Node ID c838b9c2c71b1d64b8bde786f6470b30f23962de
# Parent  d5198e5dd8087ca487031662f0908a6296512e5d
Provides output option to cat command
expand function in commands.doexport is moved to toplevel and renamed
to make_filename. The 'cat' command now accecpts --output <pattern>
switch to specify the destination file.

Index: hg/mercurial/commands.py
===================================================================
2005-07-05 18:23:56 -08:00
Radoslaw Szkodzinski
a56364bdaf Update documentation of hg tag
# HG changeset patch
# User Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
# Node ID 8fc9bfabae06cba91b05c265545bcce2654dab2f
# Parent  d5198e5dd8087ca487031662f0908a6296512e5d
Update documentation of hg tag

This updates the FAQ, manpage and adds hg tag to the list of commands
in README.

Index: hg/README
===================================================================
2005-07-05 18:23:34 -08:00
Bryan O'Sullivan
a59fdd1e1e Remove debug print from locate code.
# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Node ID 5240abb57899b745f2e6465be29d9d54c4777364
# Parent  13b74665cbdf735a91f231956d0fe73e446340ea
Remove debug print from locate code.

Index: hg/mercurial/commands.py
===================================================================
2005-07-05 18:22:28 -08:00
Bryan O'Sullivan
6e84e17e73 Clarify man page entry for locate a little.
# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Node ID 13b74665cbdf735a91f231956d0fe73e446340ea
# Parent  fb74eaa2b5b763ad5591b2e51dbb377bf8342064
Clarify man page entry for locate a little.
2005-07-05 18:22:22 -08:00
Bryan O'Sullivan
f6784ca518 Use repo.getcwd() in a few obvious places.
# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Node ID fb74eaa2b5b763ad5591b2e51dbb377bf8342064
# Parent  ebf5eba347a17a5c09000b3342caf350cd060a1b
Use repo.getcwd() in a few obvious places.
2005-07-05 18:19:22 -08:00
Bryan O'Sullivan
39b21b4b72 Add locate command.
# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Node ID ebf5eba347a17a5c09000b3342caf350cd060a1b
# Parent  4309b0a5a6010dd2e5811b77d2bc29a51acf290f
Add locate command.

Used for finding files with names that match specific patterns,
such as "*.c".

This patch also introduces localrepository.getcwd, which returns the
current directory relative to the repository root.
2005-07-05 18:19:01 -08:00
Matt Mackall
6ce7b423e3 Fix quoting for RSS links
Spotted by Mikael Berthe <mikael.berthe@lilotux.net>
2005-07-05 18:15:38 -08:00
Matt Mackall
014f47251b Cleanups for repo.pull
Use repo.pull in pull and clone commands
Teach clone about ssh:// (temporarily)
Fix up shutil issue on failed pull
2005-07-05 18:12:57 -08:00