- rewrote addfile() and delete_file() methods from the Package class (for the details...
authorMarcus Huewe <suse-tux@gmx.de>
Tue, 24 Aug 2010 16:06:47 +0000 (18:06 +0200)
committerMarcus Huewe <suse-tux@gmx.de>
Tue, 31 Aug 2010 11:30:36 +0000 (13:30 +0200)
commit88a961cae4a71fe3245c56e14781fdb55e385704
tree8b849af7b473b993df13b5d0fdb76722053e9e7e
parente6b451596c797057b451923880bb0f7f973b1801
- rewrote addfile() and delete_file() methods from the Package class (for the details see below)

- addfile():
  * contains the complete logic for adding a file (=> simplified addFiles(...))
  * semantic fixes
- delete_file():
  * semantic fixes
- different handling of newly added/replaced files:
  * added/replaced files are tracked in the .osc/_to_be_added file
- introduced new file state 'R': 'R' == "replaced"
  * usecase: osc rm <file>; osc add <file> => new state is 'R'
  * conceptually 'R' is equal to 'A'
- adapted revert() to support the new state (+ some other minor fixes)
- added testcases for addfile() and delete_file()
97 files changed:
osc/core.py
tests/addfile_fixtures/oscrc [new file with mode: 0644]
tests/addfile_fixtures/osctest/.osc/_apiurl [new file with mode: 0644]
tests/addfile_fixtures/osctest/.osc/_packages [new file with mode: 0644]
tests/addfile_fixtures/osctest/.osc/_project [new file with mode: 0644]
tests/addfile_fixtures/osctest/simple/.osc/_apiurl [new file with mode: 0644]
tests/addfile_fixtures/osctest/simple/.osc/_files [new file with mode: 0644]
tests/addfile_fixtures/osctest/simple/.osc/_osclib_version [new file with mode: 0644]
tests/addfile_fixtures/osctest/simple/.osc/_package [new file with mode: 0644]
tests/addfile_fixtures/osctest/simple/.osc/_project [new file with mode: 0644]
tests/addfile_fixtures/osctest/simple/.osc/_to_be_deleted [new file with mode: 0644]
tests/addfile_fixtures/osctest/simple/.osc/foo [new file with mode: 0644]
tests/addfile_fixtures/osctest/simple/.osc/merge [new file with mode: 0644]
tests/addfile_fixtures/osctest/simple/.osc/nochange [new file with mode: 0644]
tests/addfile_fixtures/osctest/simple/merge [new file with mode: 0644]
tests/addfile_fixtures/osctest/simple/nochange [new file with mode: 0644]
tests/addfile_fixtures/osctest/simple/toadd1 [new file with mode: 0644]
tests/addfile_fixtures/osctest/simple/toadd2 [new file with mode: 0644]
tests/common.py
tests/deletefile_fixtures/oscrc [new file with mode: 0644]
tests/deletefile_fixtures/osctest/.osc/_apiurl [new file with mode: 0644]
tests/deletefile_fixtures/osctest/.osc/_packages [new file with mode: 0644]
tests/deletefile_fixtures/osctest/.osc/_project [new file with mode: 0644]
tests/deletefile_fixtures/osctest/already_deleted/.osc/_apiurl [new file with mode: 0644]
tests/deletefile_fixtures/osctest/already_deleted/.osc/_files [new file with mode: 0644]
tests/deletefile_fixtures/osctest/already_deleted/.osc/_osclib_version [new file with mode: 0644]
tests/deletefile_fixtures/osctest/already_deleted/.osc/_package [new file with mode: 0644]
tests/deletefile_fixtures/osctest/already_deleted/.osc/_project [new file with mode: 0644]
tests/deletefile_fixtures/osctest/already_deleted/.osc/_to_be_added [new file with mode: 0644]
tests/deletefile_fixtures/osctest/already_deleted/.osc/_to_be_deleted [new file with mode: 0644]
tests/deletefile_fixtures/osctest/already_deleted/.osc/foo [new file with mode: 0644]
tests/deletefile_fixtures/osctest/already_deleted/.osc/merge [new file with mode: 0644]
tests/deletefile_fixtures/osctest/already_deleted/.osc/nochange [new file with mode: 0644]
tests/deletefile_fixtures/osctest/already_deleted/merge [new file with mode: 0644]
tests/deletefile_fixtures/osctest/already_deleted/nochange [new file with mode: 0644]
tests/deletefile_fixtures/osctest/already_deleted/toadd1 [new file with mode: 0644]
tests/deletefile_fixtures/osctest/already_deleted/toadd2 [new file with mode: 0644]
tests/deletefile_fixtures/osctest/conflict/.osc/_apiurl [new file with mode: 0644]
tests/deletefile_fixtures/osctest/conflict/.osc/_files [new file with mode: 0644]
tests/deletefile_fixtures/osctest/conflict/.osc/_in_conflict [new file with mode: 0644]
tests/deletefile_fixtures/osctest/conflict/.osc/_osclib_version [new file with mode: 0644]
tests/deletefile_fixtures/osctest/conflict/.osc/_package [new file with mode: 0644]
tests/deletefile_fixtures/osctest/conflict/.osc/_project [new file with mode: 0644]
tests/deletefile_fixtures/osctest/conflict/.osc/_to_be_added [new file with mode: 0644]
tests/deletefile_fixtures/osctest/conflict/.osc/foo [new file with mode: 0644]
tests/deletefile_fixtures/osctest/conflict/.osc/merge [new file with mode: 0644]
tests/deletefile_fixtures/osctest/conflict/.osc/nochange [new file with mode: 0644]
tests/deletefile_fixtures/osctest/conflict/foo [new file with mode: 0644]
tests/deletefile_fixtures/osctest/conflict/foo.mine [new file with mode: 0644]
tests/deletefile_fixtures/osctest/conflict/foo.r2 [new file with mode: 0644]
tests/deletefile_fixtures/osctest/conflict/merge [new file with mode: 0644]
tests/deletefile_fixtures/osctest/conflict/nochange [new file with mode: 0644]
tests/deletefile_fixtures/osctest/conflict/toadd1 [new file with mode: 0644]
tests/deletefile_fixtures/osctest/conflict/toadd2 [new file with mode: 0644]
tests/deletefile_fixtures/osctest/delete/.osc/_apiurl [new file with mode: 0644]
tests/deletefile_fixtures/osctest/delete/.osc/_files [new file with mode: 0644]
tests/deletefile_fixtures/osctest/delete/.osc/_osclib_version [new file with mode: 0644]
tests/deletefile_fixtures/osctest/delete/.osc/_package [new file with mode: 0644]
tests/deletefile_fixtures/osctest/delete/.osc/_project [new file with mode: 0644]
tests/deletefile_fixtures/osctest/delete/.osc/_to_be_deleted [new file with mode: 0644]
tests/deletefile_fixtures/osctest/delete/.osc/foo [new file with mode: 0644]
tests/deletefile_fixtures/osctest/delete/.osc/merge [new file with mode: 0644]
tests/deletefile_fixtures/osctest/delete/.osc/nochange [new file with mode: 0644]
tests/deletefile_fixtures/osctest/delete/merge [new file with mode: 0644]
tests/deletefile_fixtures/osctest/delete/nochange [new file with mode: 0644]
tests/deletefile_fixtures/osctest/delete/toadd1 [new file with mode: 0644]
tests/deletefile_fixtures/osctest/delete/toadd2 [new file with mode: 0644]
tests/deletefile_fixtures/osctest/replace/.osc/_apiurl [new file with mode: 0644]
tests/deletefile_fixtures/osctest/replace/.osc/_files [new file with mode: 0644]
tests/deletefile_fixtures/osctest/replace/.osc/_osclib_version [new file with mode: 0644]
tests/deletefile_fixtures/osctest/replace/.osc/_package [new file with mode: 0644]
tests/deletefile_fixtures/osctest/replace/.osc/_project [new file with mode: 0644]
tests/deletefile_fixtures/osctest/replace/.osc/_to_be_added [new file with mode: 0644]
tests/deletefile_fixtures/osctest/replace/.osc/foo [new file with mode: 0644]
tests/deletefile_fixtures/osctest/replace/.osc/merge [new file with mode: 0644]
tests/deletefile_fixtures/osctest/replace/.osc/nochange [new file with mode: 0644]
tests/deletefile_fixtures/osctest/replace/foo [new file with mode: 0644]
tests/deletefile_fixtures/osctest/replace/merge [new file with mode: 0644]
tests/deletefile_fixtures/osctest/replace/nochange [new file with mode: 0644]
tests/deletefile_fixtures/osctest/replace/toadd1 [new file with mode: 0644]
tests/deletefile_fixtures/osctest/replace/toadd2 [new file with mode: 0644]
tests/deletefile_fixtures/osctest/simple/.osc/_apiurl [new file with mode: 0644]
tests/deletefile_fixtures/osctest/simple/.osc/_files [new file with mode: 0644]
tests/deletefile_fixtures/osctest/simple/.osc/_osclib_version [new file with mode: 0644]
tests/deletefile_fixtures/osctest/simple/.osc/_package [new file with mode: 0644]
tests/deletefile_fixtures/osctest/simple/.osc/_project [new file with mode: 0644]
tests/deletefile_fixtures/osctest/simple/.osc/_to_be_added [new file with mode: 0644]
tests/deletefile_fixtures/osctest/simple/.osc/foo [new file with mode: 0644]
tests/deletefile_fixtures/osctest/simple/.osc/merge [new file with mode: 0644]
tests/deletefile_fixtures/osctest/simple/.osc/nochange [new file with mode: 0644]
tests/deletefile_fixtures/osctest/simple/foo [new file with mode: 0644]
tests/deletefile_fixtures/osctest/simple/merge [new file with mode: 0644]
tests/deletefile_fixtures/osctest/simple/nochange [new file with mode: 0644]
tests/deletefile_fixtures/osctest/simple/toadd1 [new file with mode: 0644]
tests/deletefile_fixtures/osctest/simple/toadd2 [new file with mode: 0644]
tests/test_addfiles.py [new file with mode: 0644]
tests/test_deletefiles.py [new file with mode: 0644]