tests/test-convert-bzr-114.t
author Raphaël Gomès <rgomes@octobus.net>
Mon, 26 Apr 2021 22:59:56 +0200
changeset 47377 26127236b229
parent 26066 89872688893f
permissions -rw-r--r--
convert-bazaar: use breezy package instead of old bzr one Breezy is the most recent of the two, and works on Python 3 while being compatible with the (old) Bazaar file format. This patch contains a variety of unicode <-> bytes changes, API breakage fixing, restoring failing imports and changing the executable from `bzr` to `brz`. I recommend using the debian packages for `brz` and `python3-breezy` (3.1+), because the pip package seems to be haunted by radioactive dragons. Differential Revision: https://phab.mercurial-scm.org/D10513
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
47377
26127236b229 convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents: 26066
diff changeset
     1
#require bzr
12513
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
     2
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
     3
  $ . "$TESTDIR/bzr-definitions"
8126
13b36eb14324 convert/bzr: handle files replaced by directories (issue1623)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     4
12513
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
     5
The file/directory replacement can only be reproduced on
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
     6
bzr >= 1.4. Merge it back in test-convert-bzr-directories once
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
     7
this version becomes mainstream.
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
     8
replace file with dir
8126
13b36eb14324 convert/bzr: handle files replaced by directories (issue1623)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     9
12513
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
    10
  $ mkdir test-replace-file-with-dir
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
    11
  $ cd test-replace-file-with-dir
47377
26127236b229 convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents: 26066
diff changeset
    12
  $ brz init -q source
12513
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
    13
  $ cd source
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
    14
  $ echo d > d
47377
26127236b229 convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents: 26066
diff changeset
    15
  $ brz add -q d
26127236b229 convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents: 26066
diff changeset
    16
  $ brz commit -q -m 'add d file'
12513
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
    17
  $ rm d
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
    18
  $ mkdir d
47377
26127236b229 convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents: 26066
diff changeset
    19
  $ brz add -q d
26127236b229 convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents: 26066
diff changeset
    20
  $ brz commit -q -m 'replace with d dir'
12513
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
    21
  $ echo a > d/a
47377
26127236b229 convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents: 26066
diff changeset
    22
  $ brz add -q d/a
26127236b229 convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents: 26066
diff changeset
    23
  $ brz commit -q -m 'add d/a'
12513
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
    24
  $ cd ..
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
    25
  $ hg convert source source-hg
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
    26
  initializing destination source-hg repository
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
    27
  scanning source...
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
    28
  sorting...
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
    29
  converting...
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
    30
  2 add d file
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
    31
  1 replace with d dir
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
    32
  0 add d/a
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
    33
  $ manifest source-hg tip
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
    34
  % manifest of tip
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
    35
  644   d/a
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
    36
  $ cd source-hg
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
    37
  $ hg update
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
    38
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
d1f88ae495b4 tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com>
parents: 8126
diff changeset
    39
  $ cd ../..