Rev 1369: Merge partial support for stacked branches. in http://people.samba.org/bzr/jelmer/bzr-svn/0.4

Jelmer Vernooij jelmer at samba.org
Sat Jun 28 04:11:48 BST 2008


At http://people.samba.org/bzr/jelmer/bzr-svn/0.4

------------------------------------------------------------
revno: 1369
revision-id: jelmer at samba.org-20080628031146-cnlgw6iqhrnblyc8
parent: jelmer at samba.org-20080627000850-f1l89dkqlxuuye5b
parent: jelmer at samba.org-20080628030340-mzqzpokfwod0as18
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-06-28 05:11:46 +0200
message:
  Merge partial support for stacked branches.
modified:
  Makefile                       makefile.other-20080311181537-5svhje3v1flh1n4f-1
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
  delta.py                       delta.py-20080316001917-xyng7m3jlxvdc4c9-1
  editor.c                       editor.c-20080602191336-frj7az1sdk13o1tw-1
  fileids.py                     fileids.py-20060714013623-u5iiyqqnko11grcf-1
  logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
  ra.c                           ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
  tests/__init__.py              __init__.py-20060508151940-e9f4d914801a2535
  tests/test_fetch.py            test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
  tests/test_fileids.py          test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
  tests/test_push.py             test_push.py-20070201165715-g2ievcdfqi33wqsy-1
  tests/test_repository.py       test_repos.py-20060508151940-ddc49a59257ca712
  tests/test_transport.py        test_transport.py-20060621232111-xh7xvoblzsrgj79t-1
  tests/test_tree.py             test_tree.py-20070103204350-pr8nupes7e5sd2wr-1
  tests/test_versionedfiles.py   test_versionedfiles.-20080626153242-v0c6uolklpux67a1-1
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
  util.c                         util.c-20080531154025-s8ef6ej9tytsnkkw-1
  versionedfiles.py              versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
    ------------------------------------------------------------
    revno: 1368.1.25
    revision-id: jelmer at samba.org-20080628030340-mzqzpokfwod0as18
    parent: jelmer at samba.org-20080628030324-xuw01kyj3in23yrv
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: stackable
    timestamp: Sat 2008-06-28 05:03:40 +0200
    message:
      Deal with the fact inventory_sha1 can't be None.
    modified:
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
    ------------------------------------------------------------
    revno: 1368.1.24
    revision-id: jelmer at samba.org-20080628030324-xuw01kyj3in23yrv
    parent: jelmer at samba.org-20080628021542-7gdny8vrapok9v7u
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: stackable
    timestamp: Sat 2008-06-28 05:03:24 +0200
    message:
      Deal with absent content.
    modified:
      versionedfiles.py              versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
    ------------------------------------------------------------
    revno: 1368.1.23
    revision-id: jelmer at samba.org-20080628021542-7gdny8vrapok9v7u
    parent: jelmer at samba.org-20080628021421-79f5nmgcq388xuc1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: stackable
    timestamp: Sat 2008-06-28 04:15:42 +0200
    message:
      Fix construction of fake texts.
    modified:
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
    ------------------------------------------------------------
    revno: 1368.1.22
    revision-id: jelmer at samba.org-20080628021421-79f5nmgcq388xuc1
    parent: jelmer at samba.org-20080628015301-6gd76dge9h4406fc
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: stackable
    timestamp: Sat 2008-06-28 04:14:21 +0200
    message:
      Add wrapper for get-file.
    modified:
      transport.py                   transport.py-20060406231150-b3472d06b3a0818d
    ------------------------------------------------------------
    revno: 1368.1.21
    revision-id: jelmer at samba.org-20080628015301-6gd76dge9h4406fc
    parent: jelmer at samba.org-20080627225252-el1byuv3mn5jkrfr
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: stackable
    timestamp: Sat 2008-06-28 03:53:01 +0200
    message:
      Implement get_record_stream() for files.
    modified:
      fileids.py                     fileids.py-20060714013623-u5iiyqqnko11grcf-1
      ra.c                           ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
      versionedfiles.py              versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
    ------------------------------------------------------------
    revno: 1368.1.20
    revision-id: jelmer at samba.org-20080627225252-el1byuv3mn5jkrfr
    parent: jelmer at samba.org-20080627222333-jv28jra07no8txoy
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: stackable
    timestamp: Sat 2008-06-28 00:52:52 +0200
    message:
      implement content for FakeRevisionTexts.
    modified:
      versionedfiles.py              versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
    ------------------------------------------------------------
    revno: 1368.1.19
    revision-id: jelmer at samba.org-20080627222333-jv28jra07no8txoy
    parent: jelmer at samba.org-20080627222030-coqhvjkrucsbzox2
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: stackable
    timestamp: Sat 2008-06-28 00:23:33 +0200
    message:
      Switch to using serializer format 7
    modified:
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
    ------------------------------------------------------------
    revno: 1368.1.18
    revision-id: jelmer at samba.org-20080627222030-coqhvjkrucsbzox2
    parent: jelmer at samba.org-20080627215452-m3wc33d8hrytynab
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: stackable
    timestamp: Sat 2008-06-28 00:20:30 +0200
    message:
      Fix versionedfiles tests.
    modified:
      tests/test_versionedfiles.py   test_versionedfiles.-20080626153242-v0c6uolklpux67a1-1
      versionedfiles.py              versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
    ------------------------------------------------------------
    revno: 1368.1.17
    revision-id: jelmer at samba.org-20080627215452-m3wc33d8hrytynab
    parent: jelmer at samba.org-20080627211327-60tdygznt0nz17cz
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: stackable
    timestamp: Fri 2008-06-27 23:54:52 +0200
    message:
      Implement get_record_stream in FakeVersionedFiles.
    modified:
      tests/test_versionedfiles.py   test_versionedfiles.-20080626153242-v0c6uolklpux67a1-1
      versionedfiles.py              versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
    ------------------------------------------------------------
    revno: 1368.1.16
    revision-id: jelmer at samba.org-20080627211327-60tdygznt0nz17cz
    parent: jelmer at samba.org-20080627191110-j0t5mtvnlbokmzo0
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: stackable
    timestamp: Fri 2008-06-27 23:13:27 +0200
    message:
      Implement FakeVersionedFiles.get_parent_map.
    modified:
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
      tests/test_versionedfiles.py   test_versionedfiles.-20080626153242-v0c6uolklpux67a1-1
      versionedfiles.py              versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
    ------------------------------------------------------------
    revno: 1368.1.15
    revision-id: jelmer at samba.org-20080627191110-j0t5mtvnlbokmzo0
    parent: jelmer at samba.org-20080627185607-554l1oh62x0g3spq
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-06-27 21:11:10 +0200
    message:
      Couple more.
    modified:
      tests/test_tree.py             test_tree.py-20070103204350-pr8nupes7e5sd2wr-1
    ------------------------------------------------------------
    revno: 1368.1.14
    revision-id: jelmer at samba.org-20080627185607-554l1oh62x0g3spq
    parent: jelmer at samba.org-20080627184340-9f9p6ml8qgv4shb3
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-06-27 20:56:07 +0200
    message:
      use commit editor in some places in tree tests.
    modified:
      tests/test_tree.py             test_tree.py-20070103204350-pr8nupes7e5sd2wr-1
    ------------------------------------------------------------
    revno: 1368.1.13
    revision-id: jelmer at samba.org-20080627184340-9f9p6ml8qgv4shb3
    parent: jelmer at samba.org-20080627162804-xxfjk30jfb53ilvb
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-06-27 20:43:40 +0200
    message:
      Convert some push tests to use the new commit builder API.
    modified:
      tests/test_push.py             test_push.py-20070201165715-g2ievcdfqi33wqsy-1
    ------------------------------------------------------------
    revno: 1368.1.12
    revision-id: jelmer at samba.org-20080627162804-xxfjk30jfb53ilvb
    parent: jelmer at samba.org-20080627160900-h5ohd3s3ihgudvm0
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-06-27 18:28:04 +0200
    message:
      Use python implementation of send to stream function.
    modified:
      commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
      ra.c                           ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
      tests/__init__.py              __init__.py-20060508151940-e9f4d914801a2535
    ------------------------------------------------------------
    revno: 1368.1.11
    revision-id: jelmer at samba.org-20080627160900-h5ohd3s3ihgudvm0
    parent: jelmer at samba.org-20080627160843-si92kpohff7odbyz
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-06-27 18:09:00 +0200
    message:
      Allow calling txdelta objects.
    modified:
      editor.c                       editor.c-20080602191336-frj7az1sdk13o1tw-1
    ------------------------------------------------------------
    revno: 1368.1.10
    revision-id: jelmer at samba.org-20080627160843-si92kpohff7odbyz
    parent: jelmer at samba.org-20080627160656-euinqa9o58zele7x
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-06-27 18:08:43 +0200
    message:
      Properly propagate sentinel in delta steam.
    modified:
      ra.c                           ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
    ------------------------------------------------------------
    revno: 1368.1.9
    revision-id: jelmer at samba.org-20080627160656-euinqa9o58zele7x
    parent: jelmer at samba.org-20080627160625-f91ndu87b61qqeip
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-06-27 18:06:56 +0200
    message:
      Extra type checking.
    modified:
      util.c                         util.c-20080531154025-s8ef6ej9tytsnkkw-1
    ------------------------------------------------------------
    revno: 1368.1.8
    revision-id: jelmer at samba.org-20080627160625-f91ndu87b61qqeip
    parent: jelmer at samba.org-20080627153722-zlllf1p4yodxxqxq
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-06-27 18:06:25 +0200
    message:
      Convert more functions to use the new commit editor interface.
    modified:
      tests/test_fetch.py            test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
    ------------------------------------------------------------
    revno: 1368.1.7
    revision-id: jelmer at samba.org-20080627153722-zlllf1p4yodxxqxq
    parent: jelmer at samba.org-20080627153705-hw31usrbrap2r6et
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-06-27 17:37:22 +0200
    message:
      Implement send_stream to delta function in Python.
    modified:
      delta.py                       delta.py-20080316001917-xyng7m3jlxvdc4c9-1
    ------------------------------------------------------------
    revno: 1368.1.6
    revision-id: jelmer at samba.org-20080627153705-hw31usrbrap2r6et
    parent: jelmer at samba.org-20080627131147-8i7kasn0nyv61zwf
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-06-27 17:37:05 +0200
    message:
      use new commit editor in more tests.
    modified:
      tests/test_fetch.py            test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
    ------------------------------------------------------------
    revno: 1368.1.5
    revision-id: jelmer at samba.org-20080627131147-8i7kasn0nyv61zwf
    parent: jelmer at samba.org-20080627020649-nacc0x4i64ov53jb
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-06-27 15:11:47 +0200
    message:
      Add target for checking for memory leaks.
    modified:
      Makefile                       makefile.other-20080311181537-5svhje3v1flh1n4f-1
    ------------------------------------------------------------
    revno: 1368.1.4
    revision-id: jelmer at samba.org-20080627020649-nacc0x4i64ov53jb
    parent: jelmer at samba.org-20080627013347-b2r3s55fjhgojczf
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-06-27 04:06:49 +0200
    message:
      Use new commit editor API
    modified:
      tests/__init__.py              __init__.py-20060508151940-e9f4d914801a2535
      tests/test_fileids.py          test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
    ------------------------------------------------------------
    revno: 1368.1.3
    revision-id: jelmer at samba.org-20080627013347-b2r3s55fjhgojczf
    parent: jelmer at samba.org-20080627012316-8epygb9zafth1f15
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-06-27 03:33:47 +0200
    message:
      use new commit editor in transport tests.
    modified:
      tests/test_transport.py        test_transport.py-20060621232111-xh7xvoblzsrgj79t-1
    ------------------------------------------------------------
    revno: 1368.1.2
    revision-id: jelmer at samba.org-20080627012316-8epygb9zafth1f15
    parent: jelmer at samba.org-20080627001522-ummfuc5ieortfpjh
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-06-27 03:23:16 +0200
    message:
      Use new commit editor.
    modified:
      tests/test_repository.py       test_repos.py-20060508151940-ddc49a59257ca712
    ------------------------------------------------------------
    revno: 1368.1.1
    revision-id: jelmer at samba.org-20080627001522-ummfuc5ieortfpjh
    parent: jelmer at samba.org-20080627000850-f1l89dkqlxuuye5b
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-06-27 02:15:22 +0200
    message:
      Use portable argument to get_log().
    modified:
      logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1

Diff too large for email (2360 lines, the limit is 1000).



More information about the bazaar-commits mailing list