mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
66f2e5f45e
Summary:
This hardcodes several perftweaks configs that have been enabled for major FB
repos for months:
[perftweaks]
disablebranchcache = True
disablebranchcache2 = True
disableresolvingbranches = True
disableupdatebranchcacheoncommit = True
Practically, this means the branchmap is now just `{'default': heads}`. (i.e.
there are no named branches other than `default`), and branchcache is removed
(i.e. `.hg/cache` does not exist without clindex or in-repo tags).
This diff only makes easy-to-verify logic changes by assuming the configs and
removing dead code. Things can be further cleaned up. They will be done by
upcoming changes.
Most test changes are due to the fact that `.hg/cache` is no longer created.
Reviewed By: singhsrb
Differential Revision: D14179858
fbshipit-source-id: 479f7427168eb1d9614a973e273a229e50f5620a
210 lines
4.8 KiB
Raku
210 lines
4.8 KiB
Raku
$ . "$TESTDIR/histedit-helpers.sh"
|
|
|
|
Setup
|
|
|
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
> [extensions]
|
|
> amend=
|
|
> fbhistedit=
|
|
> histedit=
|
|
> rebase=
|
|
> [experimental]
|
|
> evolution = createmarkers
|
|
> EOF
|
|
|
|
$ initrepo ()
|
|
> {
|
|
> hg init r
|
|
> cd r
|
|
> for x in a b c d e f ; do
|
|
> echo $x > $x
|
|
> hg add $x
|
|
> hg ci -m $x
|
|
> done
|
|
> }
|
|
|
|
$ initrepo
|
|
|
|
log before edit
|
|
|
|
$ hg log --graph
|
|
@ changeset: 5:652413bf663e
|
|
| tag: tip
|
|
| user: test
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
| summary: f
|
|
|
|
|
o changeset: 4:e860deea161a
|
|
| user: test
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
| summary: e
|
|
|
|
|
o changeset: 3:055a42cdd887
|
|
| user: test
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
| summary: d
|
|
|
|
|
o changeset: 2:177f92b77385
|
|
| user: test
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
| summary: c
|
|
|
|
|
o changeset: 1:d2ae7f538514
|
|
| user: test
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
| summary: b
|
|
|
|
|
o changeset: 0:cb9a9f314b8b
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: a
|
|
|
|
|
|
stop & continue cannot preserve hashes without obsolescence
|
|
|
|
$ hg histedit 177f92b77385 --commands - 2>&1 << EOF| fixbundle
|
|
> pick 177f92b77385 c
|
|
> pick 055a42cdd887 d
|
|
> stop e860deea161a e
|
|
> pick 652413bf663e f
|
|
> EOF
|
|
Changes committed as 04d2fab98077. You may amend the changeset now.
|
|
When you are done, run hg histedit --continue to resume
|
|
|
|
$ hg histedit --continue
|
|
|
|
$ hg log --graph
|
|
@ changeset: 7:794fe033d0a0
|
|
| tag: tip
|
|
| user: test
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
| summary: f
|
|
|
|
|
o changeset: 6:04d2fab98077
|
|
| parent: 3:055a42cdd887
|
|
| user: test
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
| summary: e
|
|
|
|
|
o changeset: 3:055a42cdd887
|
|
| user: test
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
| summary: d
|
|
|
|
|
o changeset: 2:177f92b77385
|
|
| user: test
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
| summary: c
|
|
|
|
|
o changeset: 1:d2ae7f538514
|
|
| user: test
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
| summary: b
|
|
|
|
|
o changeset: 0:cb9a9f314b8b
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: a
|
|
|
|
|
|
stop on a commit
|
|
|
|
$ hg histedit 177f92b77385 --commands - 2>&1 << EOF| fixbundle
|
|
> pick 177f92b77385 c
|
|
> pick 055a42cdd887 d
|
|
> stop 04d2fab98077 e
|
|
> pick 794fe033d0a0 f
|
|
> EOF
|
|
Changes committed as d28623a90f2b. You may amend the changeset now.
|
|
When you are done, run hg histedit --continue to resume
|
|
|
|
$ hg id -r . -i
|
|
d28623a90f2b
|
|
$ echo added > added
|
|
$ hg add added
|
|
$ hg commit --amend
|
|
|
|
$ hg log -v -r '.' --template '{files}\n'
|
|
added e
|
|
$ hg histedit --continue
|
|
|
|
$ hg log --graph --template '{node|short} {desc} {files}\n'
|
|
@ 099559071076 f f
|
|
|
|
|
o d51720eb7a13 e added e
|
|
|
|
|
o 055a42cdd887 d d
|
|
|
|
|
o 177f92b77385 c c
|
|
|
|
|
o d2ae7f538514 b b
|
|
|
|
|
o cb9a9f314b8b a a
|
|
|
|
|
|
check histedit_source
|
|
|
|
$ hg log --debug --rev '.^'
|
|
changeset: 9:d51720eb7a133e2dabf74a445e509a3900e9c0b5
|
|
phase: draft
|
|
parent: 3:055a42cdd88768532f9cf79daa407fc8d138de9b
|
|
parent: -1:0000000000000000000000000000000000000000
|
|
manifest: 6:b2ebbc42649134e3236996c0a3b1c6ec526e8f2e
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
files+: added e
|
|
extra: amend_source=d28623a90f2b5c38b6c3ca503c86847b34c9bfdf
|
|
extra: branch=default
|
|
extra: histedit_source=04d2fab980779f332dec458cc944f28de8b43435
|
|
description:
|
|
e
|
|
|
|
|
|
fold a commit to check if other non-pick actions are handled correctly
|
|
|
|
$ hg histedit 177f92b77385 --commands - 2>&1 << EOF| fixbundle
|
|
> pick 177f92b77385 c
|
|
> fold 055a42cdd887 d
|
|
> stop d51720eb7a13 e
|
|
> pick 099559071076 f
|
|
> EOF
|
|
Changes committed as 08cf87522012. You may amend the changeset now.
|
|
When you are done, run hg histedit --continue to resume
|
|
|
|
$ hg histedit --continue
|
|
|
|
$ hg log --graph --template '{node|short} {desc} {files}\n'
|
|
@ 3c9ba74168ea f f
|
|
|
|
|
o 08cf87522012 e added e
|
|
|
|
|
o 66584b8c84e1 c
|
|
| ***
|
|
| d c d
|
|
o d2ae7f538514 b b
|
|
|
|
|
o cb9a9f314b8b a a
|
|
|
|
$ hg histedit 08cf87522012 --commands - 2>&1 << EOF| fixbundle
|
|
> stop 08cf87522012
|
|
> pick 3c9ba74168ea
|
|
> EOF
|
|
Changes committed as 7228fc97bd5e. You may amend the changeset now.
|
|
When you are done, run hg histedit --continue to resume
|
|
|
|
$ hg histedit --abort
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg log --graph --template '{node|short} {desc} {files}\n'
|
|
@ 3c9ba74168ea f f
|
|
|
|
|
o 08cf87522012 e added e
|
|
|
|
|
o 66584b8c84e1 c
|
|
| ***
|
|
| d c d
|
|
o d2ae7f538514 b b
|
|
|
|
|
o cb9a9f314b8b a a
|
|
|