← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to contrib/pwk

  • Committer: Vincent Ladeuil
  • Date: 2009-12-14 15:51:36 UTC
  • mto: (4894.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4895.
  • Revision ID: v.ladeuil+lp@free.fr-20091214155136-rf4nkqvxda9oiw4u
Cleanup tests and tweak the text displayed.

* bzrlib/tests/blackbox/test_update.py:
Fix imports and replace the assertContainsRe with assertEqualDiff
to make the test clearer, more robust and easier to debug.

* bzrlib/tests/commands/test_update.py: 
Fix imports.

* bzrlib/tests/blackbox/test_filtered_view_ops.py: 
Fix imports and strange accesses to base class methods.
(TestViewTreeOperations.test_view_on_update): Avoid os.chdir()
call, simplify string matching assertions.

* bzrlib/builtins.py:
(cmd_update.run): Fix spurious space, get rid of the final '/' for
the base path, don't add a final period (it's a legal char in a
path and would be annoying for people that like to copy/paste).

Show diffs side-by-side

added added

removed removed

Lines of Context:
contrib/pwk
10
10
PWK_ROOT='http://patchwork.ozlabs.org/bazaar-ng'
11
11
PWK_AUTH_ROOT='https://patchwork.ozlabs.org/bazaar-ng'
12
12
 
13
 
# bzr uses -p0 style; others use -p1
14
 
PATCH_OPTS='-p0'
15
 
 
16
13
usage() {
17
14
    cat <<EOF
18
15
usage: 
42
39
    catpatch $2 | ${PAGER:-less}
43
40
    ;;
44
41
try)
45
 
    catpatch $2 | patch -p0 --dry-run
 
42
    catpatch $2 | patch -p1 --dry-run
46
43
    ;;
47
44
apply)
48
 
    catpatch $2 | patch -p0
 
45
    catpatch $2 | patch -p1
49
46
    ;;
50
47
*)
51
48
    usage
52
49
    exit 1
53
 
esac
 
 
b'\\ No newline at end of file'
 
50
esac