+++ /dev/null
-[general]
-# URL to access API server, e.g. https://api.opensuse.org
-# you also need a section [https://api.opensuse.org] with the credentials
-apiurl = http://localhost
-# Downloaded packages are cached here. Must be writable by you.
-#packagecachedir = /var/tmp/osbuild-packagecache
-# Wrapper to call build as root (sudo, su -, ...)
-#su-wrapper = su -c
-# rootdir to setup the chroot environment
-# can contain %(repo)s, %(arch)s, %(project)s and %(package)s for replacement, e.g.
-# /srv/oscbuild/%(repo)s-%(arch)s or
-# /srv/oscbuild/%(repo)s-%(arch)s-%(project)s-%(package)s
-#build-root = /var/tmp/build-root
-# compile with N jobs (default: "getconf _NPROCESSORS_ONLN")
-#build-jobs = N
-# build-type to use - values can be (depending on the capabilities of the 'build' script)
-# empty - chroot build
-# kvm - kvm VM build (needs build-device, build-swap, build-memory)
-# xen - xen VM build (needs build-device, build-swap, build-memory)
-# experimental:
-# qemu - qemu VM build
-# lxc - lxc build
-#build-type =
-# build-device is the disk-image file to use as root for VM builds
-# e.g. /var/tmp/FILE.root
-#build-device = /var/tmp/FILE.root
-# build-swap is the disk-image to use as swap for VM builds
-# e.g. /var/tmp/FILE.swap
-#build-swap = /var/tmp/FILE.swap
-# build-memory is the amount of memory used in the VM
-# value in MB - e.g. 512
-#build-memory = 512
-# build-vmdisk-rootsize is the size of the disk-image used as root in a VM build
-# values in MB - e.g. 4096
-#build-vmdisk-rootsize = 4096
-# build-vmdisk-swapsize is the size of the disk-image used as swap in a VM build
-# values in MB - e.g. 1024
-#build-vmdisk-swapsize = 1024
-# Numeric uid:gid to assign to the "abuild" user in the build-root
-# or "caller" to use the current users uid:gid
-# This is convenient when sharing the buildroot with ordinary userids
-# on the host.
-# This should not be 0
-# build-uid =
-# extra packages to install when building packages locally (osc build)
-# this corresponds to osc build's -x option and can be overridden with that
-# -x '' can also be given on the command line to override this setting, or
-# you can have an empty setting here.
-#extra-pkgs = vim gdb strace
-# build platform is used if the platform argument is omitted to osc build
-#build_repository = openSUSE_Factory
-# default project for getpac or bco
-#getpac_default_project = openSUSE:Factory
-# alternate filesystem layout: have multiple subdirs, where colons were.
-#checkout_no_colon = 0
-# local files to ignore with status, addremove, ....
-#exclude_glob = .osc CVS .svn .* _linkerror *~ #*# *.orig *.bak *.changes.*
-# keep passwords in plaintext. If you see this comment, your osc
-# already uses the encrypted password, and only keeps them in plain text
-# for backwards compatibility. Default will change to 0 in future releases.
-# You can remove the plaintext password without harm, if you do not need
-# backwards compatibility.
-#plaintext_passwd = 1
-# limit the age of requests shown with 'osc req list'.
-# this is a default only, can be overridden by 'osc req list -D NNN'
-# Use 0 for unlimted.
-#request_list_days = 0
-# show info useful for debugging
-#debug = 1
-# show HTTP traffic useful for debugging
-#http_debug = 1
-# Skip signature verification of packages used for build.
-#no_verify = 1
-# jump into the debugger in case of errors
-#post_mortem = 1
-# print call traces in case of errors
-#traceback = 1
-# use KDE/Gnome/MacOS/Windows keyring for credentials if available
-#use_keyring = 1
-# check for unversioned/removed files before commit
-#check_filelist = 1
-# check for pending requests after executing an action (e.g. checkout, update, commit)
-#check_for_request_on_action = 0
-# what to do with the source package if the submitrequest has been accepted. If
-# nothing is specified the API default is used
-#submitrequest_on_accept_action = cleanup|update|noupdate
-#review requests interactively (default: off)
-#request_show_review = 1
-# Directory with executables to validate sources, esp before committing
-#source_validator_directory = /usr/lib/osc/source_validators
-
-[http://localhost]
-user=Admin
-pass=opensuse
-# set aliases for this apiurl
-# aliases = foo, bar
-# email used in .changes, unless the one from osc meta prj <user> will be used
-# email =
-# additional headers to pass to a request, e.g. for special authentication
-#http_headers = Host: foofoobar,
-# User: mumblegack
-# Force using of keyring for this API
-#keyring = 1
+++ /dev/null
-http://localhost
+++ /dev/null
-<project name="osctest" />
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
\ No newline at end of file
+++ /dev/null
-simple
\ No newline at end of file
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-[general]
-# URL to access API server, e.g. https://api.opensuse.org
-# you also need a section [https://api.opensuse.org] with the credentials
-apiurl = http://localhost
-# Downloaded packages are cached here. Must be writable by you.
-#packagecachedir = /var/tmp/osbuild-packagecache
-# Wrapper to call build as root (sudo, su -, ...)
-#su-wrapper = su -c
-# rootdir to setup the chroot environment
-# can contain %(repo)s, %(arch)s, %(project)s and %(package)s for replacement, e.g.
-# /srv/oscbuild/%(repo)s-%(arch)s or
-# /srv/oscbuild/%(repo)s-%(arch)s-%(project)s-%(package)s
-#build-root = /var/tmp/build-root
-# compile with N jobs (default: "getconf _NPROCESSORS_ONLN")
-#build-jobs = N
-# build-type to use - values can be (depending on the capabilities of the 'build' script)
-# empty - chroot build
-# kvm - kvm VM build (needs build-device, build-swap, build-memory)
-# xen - xen VM build (needs build-device, build-swap, build-memory)
-# experimental:
-# qemu - qemu VM build
-# lxc - lxc build
-#build-type =
-# build-device is the disk-image file to use as root for VM builds
-# e.g. /var/tmp/FILE.root
-#build-device = /var/tmp/FILE.root
-# build-swap is the disk-image to use as swap for VM builds
-# e.g. /var/tmp/FILE.swap
-#build-swap = /var/tmp/FILE.swap
-# build-memory is the amount of memory used in the VM
-# value in MB - e.g. 512
-#build-memory = 512
-# build-vmdisk-rootsize is the size of the disk-image used as root in a VM build
-# values in MB - e.g. 4096
-#build-vmdisk-rootsize = 4096
-# build-vmdisk-swapsize is the size of the disk-image used as swap in a VM build
-# values in MB - e.g. 1024
-#build-vmdisk-swapsize = 1024
-# Numeric uid:gid to assign to the "abuild" user in the build-root
-# or "caller" to use the current users uid:gid
-# This is convenient when sharing the buildroot with ordinary userids
-# on the host.
-# This should not be 0
-# build-uid =
-# extra packages to install when building packages locally (osc build)
-# this corresponds to osc build's -x option and can be overridden with that
-# -x '' can also be given on the command line to override this setting, or
-# you can have an empty setting here.
-#extra-pkgs = vim gdb strace
-# build platform is used if the platform argument is omitted to osc build
-#build_repository = openSUSE_Factory
-# default project for getpac or bco
-#getpac_default_project = openSUSE:Factory
-# alternate filesystem layout: have multiple subdirs, where colons were.
-#checkout_no_colon = 0
-# local files to ignore with status, addremove, ....
-#exclude_glob = .osc CVS .svn .* _linkerror *~ #*# *.orig *.bak *.changes.*
-# keep passwords in plaintext. If you see this comment, your osc
-# already uses the encrypted password, and only keeps them in plain text
-# for backwards compatibility. Default will change to 0 in future releases.
-# You can remove the plaintext password without harm, if you do not need
-# backwards compatibility.
-#plaintext_passwd = 1
-# limit the age of requests shown with 'osc req list'.
-# this is a default only, can be overridden by 'osc req list -D NNN'
-# Use 0 for unlimted.
-#request_list_days = 0
-# show info useful for debugging
-#debug = 1
-# show HTTP traffic useful for debugging
-#http_debug = 1
-# Skip signature verification of packages used for build.
-#no_verify = 1
-# jump into the debugger in case of errors
-#post_mortem = 1
-# print call traces in case of errors
-#traceback = 1
-# use KDE/Gnome/MacOS/Windows keyring for credentials if available
-#use_keyring = 1
-# check for unversioned/removed files before commit
-#check_filelist = 1
-# check for pending requests after executing an action (e.g. checkout, update, commit)
-#check_for_request_on_action = 0
-# what to do with the source package if the submitrequest has been accepted. If
-# nothing is specified the API default is used
-#submitrequest_on_accept_action = cleanup|update|noupdate
-#review requests interactively (default: off)
-#request_show_review = 1
-# Directory with executables to validate sources, esp before committing
-#source_validator_directory = /usr/lib/osc/source_validators
-
-[http://localhost]
-user=Admin
-pass=opensuse
-# set aliases for this apiurl
-# aliases = foo, bar
-# email used in .changes, unless the one from osc meta prj <user> will be used
-# email =
-# additional headers to pass to a request, e.g. for special authentication
-#http_headers = Host: foofoobar,
-# User: mumblegack
-# Force using of keyring for this API
-#keyring = 1
+++ /dev/null
-http://localhost
+++ /dev/null
-<project name="osctest" />
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="add" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-added file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="added_missing" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" skipped="True" />
-</directory>
+++ /dev/null
-added_missing
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="allstates" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="676513fde5797c3785164942c97dfec1" mtime="1283506309" name="missing" size="8" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
- <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" />
- <entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="skipped" size="100" skipped="true" />
-</directory>
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-add
-missing
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-added file
+++ /dev/null
-This file did change.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="unix" rev="9afa23b484de05e28364b18de7bb1432" srcmd5="9afa23b484de05e28364b18de7bb1432">
- <linkinfo baserev="b63634ab40861fdb8b44e5f4f459c621" lsrcmd5="cd21541fe2442d3d324a6d6103752913" package="unique" project="btest" srcmd5="b63634ab40861fdb8b44e5f4f459c621" />
- <entry md5="75d884cf1d235180faec5acb63063972" mtime="1283525196" name="simple" size="21" />
-</directory>
+++ /dev/null
-<package project="home:Admin" name="unix">
- <title/>
- <description>This package was branched from btest in order to ...</description>
- <person role="maintainer" userid="Admin"/>
-</package>
+++ /dev/null
-imple modified file.
+++ /dev/null
-<directory name="branch" rev="5" srcmd5="1d4bbfa2655ab3982074226e16e1e5ff" vrev="5">
- <linkinfo baserev="b63634ab40861fdb8b44e5f4f459c621" lsrcmd5="1d4bbfa2655ab3982074226e16e1e5ff" package="bar" project="foo" srcmd5="b63634ab40861fdb8b44e5f4f459c621" xsrcmd5="87ea02aede261b0267aabaa97c756e7a" />
- <entry md5="542f96b49b64095104d8a9e9dd313a9c" mtime="1283521153" name="_link" size="130" />
- <entry md5="75da7f7167c22b2b02c6879366d78ad1" mtime="1283525027" name="simple" size="22" />
-</directory>
+++ /dev/null
-<directory name="branch" rev="87ea02aede261b0267aabaa97c756e7a" srcmd5="87ea02aede261b0267aabaa97c756e7a">
- <linkinfo baserev="b63634ab40861fdb8b44e5f4f459c621" lsrcmd5="1d4bbfa2655ab3982074226e16e1e5ff" package="bar" project="foo" srcmd5="b63634ab40861fdb8b44e5f4f459c621" />
- <entry md5="75da7f7167c22b2b02c6879366d78ad1" mtime="1283525027" name="simple" size="22" />
-</directory>
+++ /dev/null
-<directory name="branch" rev="6" srcmd5="cd21541fe2442d3d324a6d6103752913" vrev="6">
- <linkinfo baserev="b63634ab40861fdb8b44e5f4f459c621" lsrcmd5="cd21541fe2442d3d324a6d6103752913" package="bar" project="foo" srcmd5="b63634ab40861fdb8b44e5f4f459c621" xsrcmd5="9afa23b484de05e28364b18de7bb1432" />
- <entry md5="542f96b49b64095104d8a9e9dd313a9c" mtime="1283521153" name="_link" size="130" skipped="true" />
- <entry md5="75d884cf1d235180faec5acb63063972" mtime="1283525196" name="simple" size="21" />
-</directory>
+++ /dev/null
-simple modified file.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="conflict" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282130148" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282130148" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282130148" name="nochange" size="25" />
-</directory>
\ No newline at end of file
+++ /dev/null
-conflict
\ No newline at end of file
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it possible
-to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="delete" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="multiple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
- <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" />
-</directory>
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-foo
-merge
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-added file
+++ /dev/null
-This file did change.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="nochanges" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" skipped="True" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-This file didn't change.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-simple
\ No newline at end of file
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-<directory name="added_missing" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2">
- <entry md5="14758f1afd44c09b7992073ccf00b43d" mtime="1292622742" name="bar" size="7" />
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282130148" name="foo" size="23" />
-</directory>
+++ /dev/null
-<directory name="added_missing" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282130148" name="foo" size="23" />
-</directory>
+++ /dev/null
-<directory><entry md5="14758f1afd44c09b7992073ccf00b43d" name="bar" /><entry md5="0d62ceea6020d75154078a20d8c9f9ba" name="foo" /></directory>
\ No newline at end of file
+++ /dev/null
-<directory error="missing" name="added_missing">
- <entry md5="14758f1afd44c09b7992073ccf00b43d" name="bar" />
-</directory>
+++ /dev/null
-<directory name="simple" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
- <entry md5="b423d194c75e59ee4d8d2e07ba24323d" mtime="1111111111" name="add" size="11" />
-</directory>
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-<directory><entry md5="b423d194c75e59ee4d8d2e07ba24323d" name="add" /><entry md5="0d62ceea6020d75154078a20d8c9f9ba" name="foo" /><entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" name="merge" /><entry md5="7efa70f68983fad1cf487f69dedf93e9" name="nochange" /></directory>
\ No newline at end of file
+++ /dev/null
-<directory error="missing" name="add">
- <entry md5="b423d194c75e59ee4d8d2e07ba24323d" name="add" />
-</directory>
+++ /dev/null
-<directory name="allstates" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2">
- <entry md5="b423d194c75e59ee4d8d2e07ba24323d" mtime="3333333333" name="add" size="11" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="d908d26cac8092d475f40a5179ca6347" mtime="4444444444" name="missing" size="9" />
- <entry md5="2abd19de6a38ff2890af64f453df96b1" mtime="2222222222" name="nochange" size="22" />
- <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" />
- <entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="skipped" size="100" />
-</directory>
+++ /dev/null
-<directory name="allstates" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2">
- <entry md5="b423d194c75e59ee4d8d2e07ba24323d" mtime="3333333333" name="add" size="11" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="d908d26cac8092d475f40a5179ca6347" mtime="4444444444" name="missing" size="9" />
- <entry md5="2abd19de6a38ff2890af64f453df96b1" mtime="2222222222" name="nochange" size="22" />
- <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" />
- <entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="skipped" size="100" skipped="true" />
-</directory>
+++ /dev/null
-<directory name="allstates" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="676513fde5797c3785164942c97dfec1" mtime="1283506309" name="missing" size="8" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
- <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" />
- <entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="skipped" size="100" />
-</directory>
+++ /dev/null
-<directory><entry md5="b423d194c75e59ee4d8d2e07ba24323d" name="add" /><entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" name="merge" /><entry md5="d908d26cac8092d475f40a5179ca6347" name="missing" /><entry md5="2abd19de6a38ff2890af64f453df96b1" name="nochange" /><entry md5="ffffffffffffffffffffffffffffffff" name="skipped" /><entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" name="test" /></directory>
\ No newline at end of file
+++ /dev/null
-<directory error="missing" name="allstates">
- <entry md5="b423d194c75e59ee4d8d2e07ba24323d" name="add" />
- <entry md5="d908d26cac8092d475f40a5179ca6347" name="missing" />
- <entry md5="2abd19de6a38ff2890af64f453df96b1" name="nochange" />
-</directory>
+++ /dev/null
-<directory name="conflict" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282130148" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282130148" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282130148" name="nochange" size="25" />
-</directory>
\ No newline at end of file
+++ /dev/null
-<directory name="simple" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
-</directory>
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-<directory><entry md5="0d62ceea6020d75154078a20d8c9f9ba" name="foo" /><entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" name="merge" /></directory>
\ No newline at end of file
+++ /dev/null
-<directory name="branch" rev="7" srcmd5="1d4bbfa2655ab3982074226e16e1e5ff" vrev="7">
- <linkinfo baserev="b63634ab40861fdb8b44e5f4f459c621" lsrcmd5="1d4bbfa2655ab3982074226e16e1e5ff" package="bar" project="foo" srcmd5="b63634ab40861fdb8b44e5f4f459c621" xsrcmd5="87ea02aede261b0267aabaa97c756e7a" />
- <entry md5="542f96b49b64095104d8a9e9dd313a9c" mtime="1283521153" name="_link" size="130" />
- <entry md5="75da7f7167c22b2b02c6879366d78ad1" mtime="1283525027" name="simple" size="22" />
-</directory>
+++ /dev/null
-<directory name="branch" rev="87ea02aede261b0267aabaa97c756e7a" srcmd5="87ea02aede261b0267aabaa97c756e7a">
- <linkinfo baserev="b63634ab40861fdb8b44e5f4f459c621" lsrcmd5="1d4bbfa2655ab3982074226e16e1e5ff" package="bar" project="foo" srcmd5="b63634ab40861fdb8b44e5f4f459c621" />
- <entry md5="75da7f7167c22b2b02c6879366d78ad1" mtime="1283525027" name="simple" size="22" />
-</directory>
+++ /dev/null
-<directory name="branch" rev="6" srcmd5="cd21541fe2442d3d324a6d6103752913" vrev="6">
- <linkinfo baserev="b63634ab40861fdb8b44e5f4f459c621" lsrcmd5="cd21541fe2442d3d324a6d6103752913" package="bar" project="foo" srcmd5="b63634ab40861fdb8b44e5f4f459c621" xsrcmd5="9afa23b484de05e28364b18de7bb1432" />
- <entry md5="542f96b49b64095104d8a9e9dd313a9c" mtime="1283521153" name="_link" size="130" skipped="true" />
- <entry md5="75d884cf1d235180faec5acb63063972" mtime="1283525196" name="simple" size="21" />
-</directory>
+++ /dev/null
-<directory><entry md5="75da7f7167c22b2b02c6879366d78ad1" name="simple" /></directory>
\ No newline at end of file
+++ /dev/null
-<directory error="missing" name="branch">
- <entry md5="75da7f7167c22b2b02c6879366d78ad1" name="simple" />
-</directory>
+++ /dev/null
-<directory><entry md5="0d62ceea6020d75154078a20d8c9f9ba" name="foo" /><entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" name="merge" /><entry md5="382588b92f5976de693f44c4d6df27b7" name="nochange" /></directory>
\ No newline at end of file
+++ /dev/null
-<directory name="simple" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2">
- <entry md5="b423d194c75e59ee4d8d2e07ba24323d" mtime="1111111111" name="add" size="11" />
- <entry md5="ea467af882b32a275fe62eb05aba6ee1" mtime="0000000000" name="add2" size="5" />
- <entry md5="2abd19de6a38ff2890af64f453df96b1" mtime="2222222222" name="nochange" size="22" />
- <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" />
-</directory>
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
- <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" />
-</directory>
+++ /dev/null
-<directory><entry md5="b423d194c75e59ee4d8d2e07ba24323d" name="add" /><entry md5="ea467af882b32a275fe62eb05aba6ee1" name="add2" /><entry md5="2abd19de6a38ff2890af64f453df96b1" name="nochange" /><entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" name="test" /></directory>
\ No newline at end of file
+++ /dev/null
-<directory error="missing" name="add">
- <entry md5="2abd19de6a38ff2890af64f453df96b1" name="nochange" />
- <entry md5="b423d194c75e59ee4d8d2e07ba24323d" name="add" />
- <entry md5="ea467af882b32a275fe62eb05aba6ee1" name="add2" />
-</directory>
+++ /dev/null
-<directory name="conflict" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282130148" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282130148" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282130148" name="nochange" size="25" />
-</directory>
\ No newline at end of file
+++ /dev/null
-<directory name="simple" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2">
- <entry md5="b423d194c75e59ee4d8d2e07ba24323d" mtime="1111111111" name="add" size="11" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="2abd19de6a38ff2890af64f453df96b1" mtime="2222222222" name="nochange" size="22" />
- <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" />
-</directory>
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
- <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" />
-</directory>
+++ /dev/null
-<directory><entry md5="b423d194c75e59ee4d8d2e07ba24323d" name="add" /><entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" name="merge" /><entry md5="2abd19de6a38ff2890af64f453df96b1" name="nochange" /><entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" name="test" /></directory>
\ No newline at end of file
+++ /dev/null
-<directory error="missing" name="partial">
- <entry md5="b423d194c75e59ee4d8d2e07ba24323d" name="add" />
- <entry md5="2abd19de6a38ff2890af64f453df96b1" name="nochange" />
-</directory>
+++ /dev/null
-<directory name="simple" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="382588b92f5976de693f44c4d6df27b7" mtime="1282047303" name="nochange" size="41" />
-</directory>
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-<directory><entry md5="0d62ceea6020d75154078a20d8c9f9ba" name="foo" /><entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" name="merge" /><entry md5="382588b92f5976de693f44c4d6df27b7" name="nochange" /></directory>
\ No newline at end of file
+++ /dev/null
-<directory error="missing" name="simple">
- <entry md5="c4eaea5dcaff13418e38e7fea151dd49" name="nochange" />
-</directory>
+++ /dev/null
-import unittest
-import urllib2
-import osc.core
-import StringIO
-import shutil
-import tempfile
-import os
-import sys
-from xml.etree import cElementTree as ET
-EXPECTED_REQUESTS = []
-
-class RequestWrongOrder(Exception):
- """raised if an unexpected request is issued to urllib2"""
- def __init__(self, url, exp_url, method, exp_method):
- Exception.__init__(self)
- self.url = url
- self.exp_url = exp_url
- self.method = method
- self.exp_method = exp_method
-
- def __str__(self):
- return '%s, %s, %s, %s' % (self.url, self.exp_url, self.method, self.exp_method)
-
-class RequestDataMismatch(Exception):
- """raised if POSTed or PUTed data doesn't match with the expected data"""
- def __init__(self, url, got, exp):
- self.url = url
- self.got = got
- self.exp = exp
-
- def __str__(self):
- return '%s, %s, %s' % (self.url, self.got, self.exp)
-
-class MyHTTPHandler(urllib2.HTTPHandler):
- def __init__(self, exp_requests, fixtures_dir):
- urllib2.HTTPHandler.__init__(self)
- self.__exp_requests = exp_requests
- self.__fixtures_dir = fixtures_dir
-
- def http_open(self, req):
- r = self.__exp_requests.pop(0)
- if req.get_full_url() != r[1] or req.get_method() != r[0]:
- raise RequestWrongOrder(req.get_full_url(), r[1], req.get_method(), r[0])
- if req.get_method() in ('GET', 'DELETE'):
- return self.__mock_GET(r[1], **r[2])
- elif req.get_method() in ('PUT', 'POST'):
- return self.__mock_PUT(req, **r[2])
-
- def __mock_GET(self, fullurl, **kwargs):
- return self.__get_response(fullurl, **kwargs)
-
- def __mock_PUT(self, req, **kwargs):
- exp = kwargs.get('exp', None)
- if exp is not None and kwargs.has_key('expfile'):
- raise RuntimeError('either specify exp or expfile')
- elif kwargs.has_key('expfile'):
- exp = open(os.path.join(self.__fixtures_dir, kwargs['expfile']), 'r').read()
- elif exp is None:
- raise RuntimeError('exp or expfile required')
- if exp is not None:
- if req.get_data() != exp:
- raise RequestDataMismatch(req.get_full_url(), repr(req.get_data()), repr(exp))
- return self.__get_response(req.get_full_url(), **kwargs)
-
- def __get_response(self, url, **kwargs):
- f = None
- if kwargs.has_key('exception'):
- raise kwargs['exception']
- if not kwargs.has_key('text') and kwargs.has_key('file'):
- f = StringIO.StringIO(open(os.path.join(self.__fixtures_dir, kwargs['file']), 'r').read())
- elif kwargs.has_key('text') and not kwargs.has_key('file'):
- f = StringIO.StringIO(kwargs['text'])
- else:
- raise RuntimeError('either specify text or file')
- resp = urllib2.addinfourl(f, {}, url)
- resp.code = kwargs.get('code', 200)
- resp.msg = ''
- return resp
-
-def urldecorator(method, fullurl, **kwargs):
- def decorate(test_method):
- def wrapped_test_method(*args):
- addExpectedRequest(method, fullurl, **kwargs)
- test_method(*args)
- # "rename" method otherwise we cannot specify a TestCaseClass.testName
- # cmdline arg when using unittest.main()
- wrapped_test_method.__name__ = test_method.__name__
- return wrapped_test_method
- return decorate
-
-def GET(fullurl, **kwargs):
- return urldecorator('GET', fullurl, **kwargs)
-
-def PUT(fullurl, **kwargs):
- return urldecorator('PUT', fullurl, **kwargs)
-
-def POST(fullurl, **kwargs):
- return urldecorator('POST', fullurl, **kwargs)
-
-def DELETE(fullurl, **kwargs):
- return urldecorator('DELETE', fullurl, **kwargs)
-
-def addExpectedRequest(method, url, **kwargs):
- global EXPECTED_REQUESTS
- EXPECTED_REQUESTS.append((method, url, kwargs))
-
-class OscTestCase(unittest.TestCase):
- def setUp(self, copytree=True):
- oscrc = os.path.join(self._get_fixtures_dir(), 'oscrc')
- osc.core.conf.get_config(override_conffile=oscrc,
- override_no_keyring=True, override_no_gnome_keyring=True)
- os.environ['OSC_CONFIG'] = oscrc
-
- self.tmpdir = tempfile.mkdtemp(prefix='osc_test')
- if copytree:
- shutil.copytree(os.path.join(self._get_fixtures_dir(), 'osctest'), os.path.join(self.tmpdir, 'osctest'))
- global EXPECTED_REQUESTS
- EXPECTED_REQUESTS = []
- osc.core.conf._build_opener = lambda u: urllib2.build_opener(MyHTTPHandler(EXPECTED_REQUESTS, self._get_fixtures_dir()))
- self.stdout = sys.stdout
- sys.stdout = StringIO.StringIO()
-
- def tearDown(self):
- self.assertTrue(len(EXPECTED_REQUESTS) == 0)
- sys.stdout = self.stdout
- try:
- shutil.rmtree(self.tmpdir)
- except:
- pass
-
- def _get_fixtures_dir(self):
- raise NotImplementedError('subclasses should implement this method')
-
- def _change_to_pkg(self, name):
- os.chdir(os.path.join(self.tmpdir, 'osctest', name))
-
- def _check_list(self, fname, exp):
- fname = os.path.join('.osc', fname)
- self.assertTrue(os.path.exists(fname))
- self.assertEqual(open(fname, 'r').read(), exp)
-
- def _check_addlist(self, exp):
- self._check_list('_to_be_added', exp)
-
- def _check_deletelist(self, exp):
- self._check_list('_to_be_deleted', exp)
-
- def _check_conflictlist(self, exp):
- self._check_list('_in_conflict', exp)
-
- def _check_status(self, p, fname, exp):
- self.assertEqual(p.status(fname), exp)
-
- def _check_digests(self, fname, *skipfiles):
- fname = os.path.join(self._get_fixtures_dir(), fname)
- self.assertEqual(open(os.path.join('.osc', '_files'), 'r').read(), open(fname, 'r').read())
- root = ET.parse(fname).getroot()
- for i in root.findall('entry'):
- if i.get('name') in skipfiles:
- continue
- self.assertTrue(os.path.exists(os.path.join('.osc', i.get('name'))))
- self.assertEqual(osc.core.dgst(os.path.join('.osc', i.get('name'))), i.get('md5'))
-
- def assertEqualMultiline(self, got, exp):
- if (got + exp).find('\n') == -1:
- self.assertEqual(got, exp)
- else:
- start_delim = "\n" + (" 8< ".join(["-----"] * 8)) + "\n"
- end_delim = "\n" + (" >8 ".join(["-----"] * 8)) + "\n\n"
- self.assertEqual(got, exp,
- "got:" + start_delim + got + end_delim +
- "expected:" + start_delim + exp + end_delim)
+++ /dev/null
-[general]
-# URL to access API server, e.g. https://api.opensuse.org
-# you also need a section [https://api.opensuse.org] with the credentials
-apiurl = http://localhost
-# Downloaded packages are cached here. Must be writable by you.
-#packagecachedir = /var/tmp/osbuild-packagecache
-# Wrapper to call build as root (sudo, su -, ...)
-#su-wrapper = su -c
-# rootdir to setup the chroot environment
-# can contain %(repo)s, %(arch)s, %(project)s and %(package)s for replacement, e.g.
-# /srv/oscbuild/%(repo)s-%(arch)s or
-# /srv/oscbuild/%(repo)s-%(arch)s-%(project)s-%(package)s
-#build-root = /var/tmp/build-root
-# compile with N jobs (default: "getconf _NPROCESSORS_ONLN")
-#build-jobs = N
-# build-type to use - values can be (depending on the capabilities of the 'build' script)
-# empty - chroot build
-# kvm - kvm VM build (needs build-device, build-swap, build-memory)
-# xen - xen VM build (needs build-device, build-swap, build-memory)
-# experimental:
-# qemu - qemu VM build
-# lxc - lxc build
-#build-type =
-# build-device is the disk-image file to use as root for VM builds
-# e.g. /var/tmp/FILE.root
-#build-device = /var/tmp/FILE.root
-# build-swap is the disk-image to use as swap for VM builds
-# e.g. /var/tmp/FILE.swap
-#build-swap = /var/tmp/FILE.swap
-# build-memory is the amount of memory used in the VM
-# value in MB - e.g. 512
-#build-memory = 512
-# build-vmdisk-rootsize is the size of the disk-image used as root in a VM build
-# values in MB - e.g. 4096
-#build-vmdisk-rootsize = 4096
-# build-vmdisk-swapsize is the size of the disk-image used as swap in a VM build
-# values in MB - e.g. 1024
-#build-vmdisk-swapsize = 1024
-# Numeric uid:gid to assign to the "abuild" user in the build-root
-# or "caller" to use the current users uid:gid
-# This is convenient when sharing the buildroot with ordinary userids
-# on the host.
-# This should not be 0
-# build-uid =
-# extra packages to install when building packages locally (osc build)
-# this corresponds to osc build's -x option and can be overridden with that
-# -x '' can also be given on the command line to override this setting, or
-# you can have an empty setting here.
-#extra-pkgs = vim gdb strace
-# build platform is used if the platform argument is omitted to osc build
-#build_repository = openSUSE_Factory
-# default project for getpac or bco
-#getpac_default_project = openSUSE:Factory
-# alternate filesystem layout: have multiple subdirs, where colons were.
-#checkout_no_colon = 0
-# local files to ignore with status, addremove, ....
-#exclude_glob = .osc CVS .svn .* _linkerror *~ #*# *.orig *.bak *.changes.*
-# keep passwords in plaintext. If you see this comment, your osc
-# already uses the encrypted password, and only keeps them in plain text
-# for backwards compatibility. Default will change to 0 in future releases.
-# You can remove the plaintext password without harm, if you do not need
-# backwards compatibility.
-#plaintext_passwd = 1
-# limit the age of requests shown with 'osc req list'.
-# this is a default only, can be overridden by 'osc req list -D NNN'
-# Use 0 for unlimted.
-#request_list_days = 0
-# show info useful for debugging
-#debug = 1
-# show HTTP traffic useful for debugging
-#http_debug = 1
-# Skip signature verification of packages used for build.
-#no_verify = 1
-# jump into the debugger in case of errors
-#post_mortem = 1
-# print call traces in case of errors
-#traceback = 1
-# use KDE/Gnome/MacOS/Windows keyring for credentials if available
-#use_keyring = 1
-# check for unversioned/removed files before commit
-#check_filelist = 1
-# check for pending requests after executing an action (e.g. checkout, update, commit)
-#check_for_request_on_action = 0
-# what to do with the source package if the submitrequest has been accepted. If
-# nothing is specified the API default is used
-#submitrequest_on_accept_action = cleanup|update|noupdate
-#review requests interactively (default: off)
-#request_show_review = 1
-# Directory with executables to validate sources, esp before committing
-#source_validator_directory = /usr/lib/osc/source_validators
-
-[http://localhost]
-user=Admin
-pass=opensuse
-# set aliases for this apiurl
-# aliases = foo, bar
-# email used in .changes, unless the one from osc meta prj <user> will be used
-# email =
-# additional headers to pass to a request, e.g. for special authentication
-#http_headers = Host: foofoobar,
-# User: mumblegack
-# Force using of keyring for this API
-#keyring = 1
+++ /dev/null
-http://localhost
+++ /dev/null
-<project name="osctest" />
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
\ No newline at end of file
+++ /dev/null
-simple
\ No newline at end of file
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="conflict" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-simple
\ No newline at end of file
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-<<<<<<< foo.mine
-This is no test.
-=======
-This is a simple test.
->>>>>>> foo.r2
+++ /dev/null
-This is no test.
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
\ No newline at end of file
+++ /dev/null
-simple
\ No newline at end of file
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
\ No newline at end of file
+++ /dev/null
-simple
\ No newline at end of file
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-toadd1
-merge
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-This is a simple test.
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
- <entry md5="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" mtime="123456789" name="skipped" size="225" skipped="true" />
- <entry md5="bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" mtime="012345678" name="skipped_exists" size="22" skipped="true" />
-</directory>
+++ /dev/null
-simple
\ No newline at end of file
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-[general]
-# URL to access API server, e.g. https://api.opensuse.org
-# you also need a section [https://api.opensuse.org] with the credentials
-apiurl = http://localhost
-# Downloaded packages are cached here. Must be writable by you.
-#packagecachedir = /var/tmp/osbuild-packagecache
-# Wrapper to call build as root (sudo, su -, ...)
-#su-wrapper = su -c
-# rootdir to setup the chroot environment
-# can contain %(repo)s, %(arch)s, %(project)s and %(package)s for replacement, e.g.
-# /srv/oscbuild/%(repo)s-%(arch)s or
-# /srv/oscbuild/%(repo)s-%(arch)s-%(project)s-%(package)s
-#build-root = /var/tmp/build-root
-# compile with N jobs (default: "getconf _NPROCESSORS_ONLN")
-#build-jobs = N
-# build-type to use - values can be (depending on the capabilities of the 'build' script)
-# empty - chroot build
-# kvm - kvm VM build (needs build-device, build-swap, build-memory)
-# xen - xen VM build (needs build-device, build-swap, build-memory)
-# experimental:
-# qemu - qemu VM build
-# lxc - lxc build
-#build-type =
-# build-device is the disk-image file to use as root for VM builds
-# e.g. /var/tmp/FILE.root
-#build-device = /var/tmp/FILE.root
-# build-swap is the disk-image to use as swap for VM builds
-# e.g. /var/tmp/FILE.swap
-#build-swap = /var/tmp/FILE.swap
-# build-memory is the amount of memory used in the VM
-# value in MB - e.g. 512
-#build-memory = 512
-# build-vmdisk-rootsize is the size of the disk-image used as root in a VM build
-# values in MB - e.g. 4096
-#build-vmdisk-rootsize = 4096
-# build-vmdisk-swapsize is the size of the disk-image used as swap in a VM build
-# values in MB - e.g. 1024
-#build-vmdisk-swapsize = 1024
-# Numeric uid:gid to assign to the "abuild" user in the build-root
-# or "caller" to use the current users uid:gid
-# This is convenient when sharing the buildroot with ordinary userids
-# on the host.
-# This should not be 0
-# build-uid =
-# extra packages to install when building packages locally (osc build)
-# this corresponds to osc build's -x option and can be overridden with that
-# -x '' can also be given on the command line to override this setting, or
-# you can have an empty setting here.
-#extra-pkgs = vim gdb strace
-# build platform is used if the platform argument is omitted to osc build
-#build_repository = openSUSE_Factory
-# default project for getpac or bco
-#getpac_default_project = openSUSE:Factory
-# alternate filesystem layout: have multiple subdirs, where colons were.
-#checkout_no_colon = 0
-# local files to ignore with status, addremove, ....
-#exclude_glob = .osc CVS .svn .* _linkerror *~ #*# *.orig *.bak *.changes.*
-# keep passwords in plaintext. If you see this comment, your osc
-# already uses the encrypted password, and only keeps them in plain text
-# for backwards compatibility. Default will change to 0 in future releases.
-# You can remove the plaintext password without harm, if you do not need
-# backwards compatibility.
-#plaintext_passwd = 1
-# limit the age of requests shown with 'osc req list'.
-# this is a default only, can be overridden by 'osc req list -D NNN'
-# Use 0 for unlimted.
-#request_list_days = 0
-# show info useful for debugging
-#debug = 1
-# show HTTP traffic useful for debugging
-#http_debug = 1
-# Skip signature verification of packages used for build.
-#no_verify = 1
-# jump into the debugger in case of errors
-#post_mortem = 1
-# print call traces in case of errors
-#traceback = 1
-# use KDE/Gnome/MacOS/Windows keyring for credentials if available
-#use_keyring = 1
-# check for unversioned/removed files before commit
-#check_filelist = 1
-# check for pending requests after executing an action (e.g. checkout, update, commit)
-#check_for_request_on_action = 0
-# what to do with the source package if the submitrequest has been accepted. If
-# nothing is specified the API default is used
-#submitrequest_on_accept_action = cleanup|update|noupdate
-#review requests interactively (default: off)
-#request_show_review = 1
-# Directory with executables to validate sources, esp before committing
-#source_validator_directory = /usr/lib/osc/source_validators
-
-[http://localhost]
-user=Admin
-pass=opensuse
-# set aliases for this apiurl
-# aliases = foo, bar
-# email used in .changes, unless the one from osc meta prj <user> will be used
-# email =
-# additional headers to pass to a request, e.g. for special authentication
-#http_headers = Host: foofoobar,
-# User: mumblegack
-# Force using of keyring for this API
-#keyring = 1
+++ /dev/null
-http://localhost
+++ /dev/null
-<project name="osctest" />
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="binary" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2">
- <entry md5="8f618462e00017108b4146a29e074bdf" mtime="1111111111" name="binary" size="18" />
- <entry md5="ee813c93cb5730dce38976695634482f" mtime="1111111111" name="binary_deleted" size="26" />
-</directory>
+++ /dev/null
-binary_added
+++ /dev/null
-binary_deleted
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
\ No newline at end of file
+++ /dev/null
-remote_localdelete
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-This is a simple test.
+++ /dev/null
-This file didn't change.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
- <entry md5="b1b642cdbacf9956104f8565e297ed00" mtime="1283246089" name="binary" size="27" />
-</directory>
+++ /dev/null
-remote_localmodified
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
-oh it does
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
\ No newline at end of file
+++ /dev/null
-remote_simple
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
\ No newline at end of file
+++ /dev/null
-remote_simple_noadd
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="replaced" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2">
- <entry md5="81be947db54c2e225dc8eacce64d8a4a" mtime="1282731457" name="replaced" size="17" />
-</directory>
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-yet another file
+++ /dev/null
-foo replaced
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="simple" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
- <entry md5="eb9c2bf0eb63f3a7bc0ea37ef18aeba5" mtime="1282730880" name="somefile" size="13" />
- <entry md5="81be947db54c2e225dc8eacce64d8a4a" mtime="1282731457" name="replaced" size="17" />
- <entry md5="676513fde5797c3785164942c97dfec1" mtime="1282731738" name="missing" size="8" />
- <entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="skipped" size="12" skipped="true" />
-</directory>
+++ /dev/null
-simple
\ No newline at end of file
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-toadd1
-replaced
-addedmissing
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-yet another file
+++ /dev/null
-some content
+++ /dev/null
-<<<<<<< foo.mine
-This is no test.
-=======
-This is a simple test.
->>>>>>> foo.r2
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-foo replaced
+++ /dev/null
-<directory name="simple" rev="3" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="3">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-<directory name="simple" rev="3" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="3">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
- <entry md5="136a96e1470ec7424bc8ae47612977db" mtime="1282914026" name="foobar" size="14" />
- <entry md5="9b55c93ffec5ef8850c84882de7ef6b5" mtime="1283242538" name="binary" size="7" />
-</directory>
+++ /dev/null
-foobar
-barfoo
+++ /dev/null
-<directory name="simple" rev="3" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="3">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-<directory name="simple" rev="3" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="3">
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-<directory name="simple" rev="3" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="3">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="daafe513479072c5a942928d1850a939" mtime="1282908295" name="merge" size="35" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-Is it
-possible to
-merge this file?
+++ /dev/null
-<directory name="simple" rev="3" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="3">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-<directory name="simple" rev="3" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="3">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
- <entry md5="b1b642cdbacf9956104f8565e297ed00" mtime="1283246089" name="binary" size="27" />
-</directory>
+++ /dev/null
-This file didn't change.
+++ /dev/null
-[general]
-# URL to access API server, e.g. https://api.opensuse.org
-# you also need a section [https://api.opensuse.org] with the credentials
-apiurl = http://localhost
-# Downloaded packages are cached here. Must be writable by you.
-#packagecachedir = /var/tmp/osbuild-packagecache
-# Wrapper to call build as root (sudo, su -, ...)
-#su-wrapper = su -c
-# rootdir to setup the chroot environment
-# can contain %(repo)s, %(arch)s, %(project)s and %(package)s for replacement, e.g.
-# /srv/oscbuild/%(repo)s-%(arch)s or
-# /srv/oscbuild/%(repo)s-%(arch)s-%(project)s-%(package)s
-#build-root = /var/tmp/build-root
-# compile with N jobs (default: "getconf _NPROCESSORS_ONLN")
-#build-jobs = N
-# build-type to use - values can be (depending on the capabilities of the 'build' script)
-# empty - chroot build
-# kvm - kvm VM build (needs build-device, build-swap, build-memory)
-# xen - xen VM build (needs build-device, build-swap, build-memory)
-# experimental:
-# qemu - qemu VM build
-# lxc - lxc build
-#build-type =
-# build-device is the disk-image file to use as root for VM builds
-# e.g. /var/tmp/FILE.root
-#build-device = /var/tmp/FILE.root
-# build-swap is the disk-image to use as swap for VM builds
-# e.g. /var/tmp/FILE.swap
-#build-swap = /var/tmp/FILE.swap
-# build-memory is the amount of memory used in the VM
-# value in MB - e.g. 512
-#build-memory = 512
-# build-vmdisk-rootsize is the size of the disk-image used as root in a VM build
-# values in MB - e.g. 4096
-#build-vmdisk-rootsize = 4096
-# build-vmdisk-swapsize is the size of the disk-image used as swap in a VM build
-# values in MB - e.g. 1024
-#build-vmdisk-swapsize = 1024
-# Numeric uid:gid to assign to the "abuild" user in the build-root
-# or "caller" to use the current users uid:gid
-# This is convenient when sharing the buildroot with ordinary userids
-# on the host.
-# This should not be 0
-# build-uid =
-# extra packages to install when building packages locally (osc build)
-# this corresponds to osc build's -x option and can be overridden with that
-# -x '' can also be given on the command line to override this setting, or
-# you can have an empty setting here.
-#extra-pkgs = vim gdb strace
-# build platform is used if the platform argument is omitted to osc build
-#build_repository = openSUSE_Factory
-# default project for getpac or bco
-#getpac_default_project = openSUSE:Factory
-# alternate filesystem layout: have multiple subdirs, where colons were.
-#checkout_no_colon = 0
-# local files to ignore with status, addremove, ....
-#exclude_glob = .osc CVS .svn .* _linkerror *~ #*# *.orig *.bak *.changes.*
-# keep passwords in plaintext. If you see this comment, your osc
-# already uses the encrypted password, and only keeps them in plain text
-# for backwards compatibility. Default will change to 0 in future releases.
-# You can remove the plaintext password without harm, if you do not need
-# backwards compatibility.
-#plaintext_passwd = 1
-# limit the age of requests shown with 'osc req list'.
-# this is a default only, can be overridden by 'osc req list -D NNN'
-# Use 0 for unlimted.
-#request_list_days = 0
-# show info useful for debugging
-#debug = 1
-# show HTTP traffic useful for debugging
-#http_debug = 1
-# Skip signature verification of packages used for build.
-#no_verify = 1
-# jump into the debugger in case of errors
-#post_mortem = 1
-# print call traces in case of errors
-#traceback = 1
-# use KDE/Gnome/MacOS/Windows keyring for credentials if available
-#use_keyring = 1
-# check for unversioned/removed files before commit
-#check_filelist = 1
-# check for pending requests after executing an action (e.g. checkout, update, commit)
-#check_for_request_on_action = 0
-# what to do with the source package if the submitrequest has been accepted. If
-# nothing is specified the API default is used
-#submitrequest_on_accept_action = cleanup|update|noupdate
-#review requests interactively (default: off)
-#request_show_review = 1
-# Directory with executables to validate sources, esp before committing
-#source_validator_directory = /usr/lib/osc/source_validators
-
-[http://localhost]
-user=Admin
-pass=opensuse
-# set aliases for this apiurl
-# aliases = foo, bar
-# email used in .changes, unless the one from osc meta prj <user> will be used
-# email =
-# additional headers to pass to a request, e.g. for special authentication
-#http_headers = Host: foofoobar,
-# User: mumblegack
-# Force using of keyring for this API
-#keyring = 1
+++ /dev/null
-[general]
-# URL to access API server, e.g. https://api.opensuse.org
-# you also need a section [https://api.opensuse.org] with the credentials
-apiurl = http://localhost
-# Downloaded packages are cached here. Must be writable by you.
-#packagecachedir = /var/tmp/osbuild-packagecache
-# Wrapper to call build as root (sudo, su -, ...)
-#su-wrapper = su -c
-# rootdir to setup the chroot environment
-# can contain %(repo)s, %(arch)s, %(project)s and %(package)s for replacement, e.g.
-# /srv/oscbuild/%(repo)s-%(arch)s or
-# /srv/oscbuild/%(repo)s-%(arch)s-%(project)s-%(package)s
-#build-root = /var/tmp/build-root
-# compile with N jobs (default: "getconf _NPROCESSORS_ONLN")
-#build-jobs = N
-# build-type to use - values can be (depending on the capabilities of the 'build' script)
-# empty - chroot build
-# kvm - kvm VM build (needs build-device, build-swap, build-memory)
-# xen - xen VM build (needs build-device, build-swap, build-memory)
-# experimental:
-# qemu - qemu VM build
-# lxc - lxc build
-#build-type =
-# build-device is the disk-image file to use as root for VM builds
-# e.g. /var/tmp/FILE.root
-#build-device = /var/tmp/FILE.root
-# build-swap is the disk-image to use as swap for VM builds
-# e.g. /var/tmp/FILE.swap
-#build-swap = /var/tmp/FILE.swap
-# build-memory is the amount of memory used in the VM
-# value in MB - e.g. 512
-#build-memory = 512
-# build-vmdisk-rootsize is the size of the disk-image used as root in a VM build
-# values in MB - e.g. 4096
-#build-vmdisk-rootsize = 4096
-# build-vmdisk-swapsize is the size of the disk-image used as swap in a VM build
-# values in MB - e.g. 1024
-#build-vmdisk-swapsize = 1024
-# Numeric uid:gid to assign to the "abuild" user in the build-root
-# or "caller" to use the current users uid:gid
-# This is convenient when sharing the buildroot with ordinary userids
-# on the host.
-# This should not be 0
-# build-uid =
-# extra packages to install when building packages locally (osc build)
-# this corresponds to osc build's -x option and can be overridden with that
-# -x '' can also be given on the command line to override this setting, or
-# you can have an empty setting here.
-#extra-pkgs = vim gdb strace
-# build platform is used if the platform argument is omitted to osc build
-#build_repository = openSUSE_Factory
-# default project for getpac or bco
-#getpac_default_project = openSUSE:Factory
-# alternate filesystem layout: have multiple subdirs, where colons were.
-#checkout_no_colon = 0
-# local files to ignore with status, addremove, ....
-#exclude_glob = .osc CVS .svn .* _linkerror *~ #*# *.orig *.bak *.changes.*
-# keep passwords in plaintext. If you see this comment, your osc
-# already uses the encrypted password, and only keeps them in plain text
-# for backwards compatibility. Default will change to 0 in future releases.
-# You can remove the plaintext password without harm, if you do not need
-# backwards compatibility.
-#plaintext_passwd = 1
-# limit the age of requests shown with 'osc req list'.
-# this is a default only, can be overridden by 'osc req list -D NNN'
-# Use 0 for unlimted.
-#request_list_days = 0
-# show info useful for debugging
-#debug = 1
-# show HTTP traffic useful for debugging
-#http_debug = 1
-# Skip signature verification of packages used for build.
-#no_verify = 1
-# jump into the debugger in case of errors
-#post_mortem = 1
-# print call traces in case of errors
-#traceback = 1
-# use KDE/Gnome/MacOS/Windows keyring for credentials if available
-#use_keyring = 1
-# check for unversioned/removed files before commit
-#check_filelist = 1
-# check for pending requests after executing an action (e.g. checkout, update, commit)
-#check_for_request_on_action = 0
-# what to do with the source package if the submitrequest has been accepted. If
-# nothing is specified the API default is used
-#submitrequest_on_accept_action = cleanup|update|noupdate
-#review requests interactively (default: off)
-#request_show_review = 1
-# Directory with executables to validate sources, esp before committing
-#source_validator_directory = /usr/lib/osc/source_validators
-
-[http://localhost]
-user=Admin
-pass=opensuse
-# set aliases for this apiurl
-# aliases = foo, bar
-# email used in .changes, unless the one from osc meta prj <user> will be used
-# email =
-# additional headers to pass to a request, e.g. for special authentication
-#http_headers = Host: foofoobar,
-# User: mumblegack
-# Force using of keyring for this API
-#keyring = 1
+++ /dev/null
-../osc
\ No newline at end of file
+++ /dev/null
-Index: common-two
-===================================================================
---- common-two 2013-01-18 19:18:38.225983117 +0000
-+++ common-two 2013-01-18 19:19:27.882082325 +0000
-@@ -1,4 +1,5 @@
- line one
- line two
- line three
-+an extra line
- last line
+++ /dev/null
-http://localhost
+++ /dev/null
-<project name="home:user:branches:some:project">
- <package name="common-one" state=" " />
- <package name="common-two" state=" " />
-</project>
\ No newline at end of file
+++ /dev/null
-home:user:branches:some:project
+++ /dev/null
-line one
-line two
-line three
-an extra line
-last line
\ No newline at end of file
+++ /dev/null
-<directory count='4'>
- <entry name="common-one"/>
- <entry name="common-two"/>
- <entry name="common-three"/>
- <entry name="only-in-new"/>
-</directory>
+++ /dev/null
-line one
-line two
-line three
-an extra line
-last line
\ No newline at end of file
+++ /dev/null
-<directory count='4'>
- <entry name="common-one"/>
- <entry name="common-two"/>
- <entry name="common-three"/>
- <entry name="only-in-new"/>
-</directory>
+++ /dev/null
-<collection matches="0">
-</collection>
+++ /dev/null
-line one
-line two
-line three
-last line
\ No newline at end of file
+++ /dev/null
-<directory count='4'>
- <entry name="common-one"/>
- <entry name="common-two"/>
- <entry name="common-three"/>
- <entry name="only-in-old"/>
-</directory>
+++ /dev/null
-[general]
-# URL to access API server, e.g. https://api.opensuse.org
-# you also need a section [https://api.opensuse.org] with the credentials
-apiurl = http://localhost
-# Downloaded packages are cached here. Must be writable by you.
-#packagecachedir = /var/tmp/osbuild-packagecache
-# Wrapper to call build as root (sudo, su -, ...)
-#su-wrapper = su -c
-# rootdir to setup the chroot environment
-# can contain %(repo)s, %(arch)s, %(project)s and %(package)s for replacement, e.g.
-# /srv/oscbuild/%(repo)s-%(arch)s or
-# /srv/oscbuild/%(repo)s-%(arch)s-%(project)s-%(package)s
-#build-root = /var/tmp/build-root
-# compile with N jobs (default: "getconf _NPROCESSORS_ONLN")
-#build-jobs = N
-# build-type to use - values can be (depending on the capabilities of the 'build' script)
-# empty - chroot build
-# kvm - kvm VM build (needs build-device, build-swap, build-memory)
-# xen - xen VM build (needs build-device, build-swap, build-memory)
-# experimental:
-# qemu - qemu VM build
-# lxc - lxc build
-#build-type =
-# build-device is the disk-image file to use as root for VM builds
-# e.g. /var/tmp/FILE.root
-#build-device = /var/tmp/FILE.root
-# build-swap is the disk-image to use as swap for VM builds
-# e.g. /var/tmp/FILE.swap
-#build-swap = /var/tmp/FILE.swap
-# build-memory is the amount of memory used in the VM
-# value in MB - e.g. 512
-#build-memory = 512
-# build-vmdisk-rootsize is the size of the disk-image used as root in a VM build
-# values in MB - e.g. 4096
-#build-vmdisk-rootsize = 4096
-# build-vmdisk-swapsize is the size of the disk-image used as swap in a VM build
-# values in MB - e.g. 1024
-#build-vmdisk-swapsize = 1024
-# Numeric uid:gid to assign to the "abuild" user in the build-root
-# or "caller" to use the current users uid:gid
-# This is convenient when sharing the buildroot with ordinary userids
-# on the host.
-# This should not be 0
-# build-uid =
-# extra packages to install when building packages locally (osc build)
-# this corresponds to osc build's -x option and can be overridden with that
-# -x '' can also be given on the command line to override this setting, or
-# you can have an empty setting here.
-#extra-pkgs = vim gdb strace
-# build platform is used if the platform argument is omitted to osc build
-#build_repository = openSUSE_Factory
-# default project for getpac or bco
-#getpac_default_project = openSUSE:Factory
-# alternate filesystem layout: have multiple subdirs, where colons were.
-#checkout_no_colon = 0
-# local files to ignore with status, addremove, ....
-#exclude_glob = .osc CVS .svn .* _linkerror *~ #*# *.orig *.bak *.changes.*
-# keep passwords in plaintext. If you see this comment, your osc
-# already uses the encrypted password, and only keeps them in plain text
-# for backwards compatibility. Default will change to 0 in future releases.
-# You can remove the plaintext password without harm, if you do not need
-# backwards compatibility.
-#plaintext_passwd = 1
-# limit the age of requests shown with 'osc req list'.
-# this is a default only, can be overridden by 'osc req list -D NNN'
-# Use 0 for unlimted.
-#request_list_days = 0
-# show info useful for debugging
-#debug = 1
-# show HTTP traffic useful for debugging
-#http_debug = 1
-# Skip signature verification of packages used for build.
-#no_verify = 1
-# jump into the debugger in case of errors
-#post_mortem = 1
-# print call traces in case of errors
-#traceback = 1
-# use KDE/Gnome/MacOS/Windows keyring for credentials if available
-#use_keyring = 1
-# check for unversioned/removed files before commit
-#check_filelist = 1
-# check for pending requests after executing an action (e.g. checkout, update, commit)
-#check_for_request_on_action = 0
-# what to do with the source package if the submitrequest has been accepted. If
-# nothing is specified the API default is used
-#submitrequest_on_accept_action = cleanup|update|noupdate
-#review requests interactively (default: off)
-#request_show_review = 1
-# Directory with executables to validate sources, esp before committing
-#source_validator_directory = /usr/lib/osc/source_validators
-
-[http://localhost]
-user=Admin
-pass=opensuse
-# set aliases for this apiurl
-# aliases = foo, bar
-# email used in .changes, unless the one from osc meta prj <user> will be used
-# email =
-# additional headers to pass to a request, e.g. for special authentication
-#http_headers = Host: foofoobar,
-# User: mumblegack
-# Force using of keyring for this API
-#keyring = 1
+++ /dev/null
-http://localhost
+++ /dev/null
-<project name="home:user:branches:some:project">
- <package name="common-one" state=" " />
- <package name="common-two" state=" " />
-</project>
\ No newline at end of file
+++ /dev/null
-home:user:branches:some:project
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="common-one" rev="f53d033d63c3d6e9a8e4493225976122" srcmd5="f53d033d63c3d6e9a8e4493225976122">
- <linkinfo baserev="896e6d6d675d03b6934946d03a976450" lsrcmd5="0cf460222270b58e2a9a3d695b1d945d" package="common-one" project="some:project" srcmd5="8c7ed3cf5ec0b4aa20ef159fd8c51b76" />
- <entry md5="1a4c23ccf2eb12403acbfa3258233a9d" mtime="1352816081" name="common-one.spec" size="3457" />
-</directory>
+++ /dev/null
-<package name="common-one" project="home:user:branches:some:project">
- <title>blah</title>
- <description>foo</description>
- <debuginfo>
- <enable repository="openSUSE_12.2"/>
- <enable repository="openSUSE_Factory"/>
- <enable repository="SLE_11_SP2"/>
- </debuginfo>
-</package>
-
+++ /dev/null
-common-one
\ No newline at end of file
+++ /dev/null
-home:user:branches:some:project
+++ /dev/null
-contents are irrelevant
+++ /dev/null
-contents are irrelevant
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="common-two" rev="f53d033d63c3d6e9a8e4493225976122" srcmd5="f53d033d63c3d6e9a8e4493225976122">
- <linkinfo baserev="896e6d6d675d03b6934946d03a976450" lsrcmd5="0cf460222270b58e2a9a3d695b1d945d" package="common-two" project="some:project" srcmd5="8c7ed3cf5ec0b4aa20ef159fd8c51b76" />
- <entry md5="1a4c23ccf2eb12403acbfa3258233a9d" mtime="1352816081" name="common-two.spec" size="3457" />
-</directory>
+++ /dev/null
-<package name="common-two" project="home:user:branches:some:project">
- <title>blah</title>
- <description>foo</description>
- <debuginfo>
- <enable repository="openSUSE_12.2"/>
- <enable repository="openSUSE_Factory"/>
- <enable repository="SLE_11_SP2"/>
- </debuginfo>
-</package>
-
+++ /dev/null
-common-two
\ No newline at end of file
+++ /dev/null
-home:user:branches:some:project
+++ /dev/null
-contents are irrelevant
+++ /dev/null
-contents are irrelevant
+++ /dev/null
-<collection matches="1">
- <request id="148023">
- <action type="submit">
- <source project="home:user:branches:some:project" package="common-two" rev="7"/>
- <target project="some:project" package="common-two"/>
- <options>
- <sourceupdate>update</sourceupdate>
- </options>
- </action>
- <state name="new" who="user" when="2013-01-11T11:04:14">
- <comment/>
- </state>
- <description>- Fix it to work
-- Improve support for something</description>
- </request>
-</collection>
+++ /dev/null
-http://localhost
+++ /dev/null
-<project name="some:project">
- <package name="common-one" state=" " />
- <package name="common-two" state=" " />
-</project>
\ No newline at end of file
+++ /dev/null
-some:project
+++ /dev/null
-line one
-line two
-line three
-an extra line
-last line
\ No newline at end of file
+++ /dev/null
-<directory count='4'>
- <entry name="common-one"/>
- <entry name="common-two"/>
- <entry name="common-three"/>
- <entry name="only-in-new"/>
-</directory>
+++ /dev/null
-[general]
-# URL to access API server, e.g. https://api.opensuse.org
-# you also need a section [https://api.opensuse.org] with the credentials
-apiurl = http://localhost
-# Downloaded packages are cached here. Must be writable by you.
-#packagecachedir = /var/tmp/osbuild-packagecache
-# Wrapper to call build as root (sudo, su -, ...)
-#su-wrapper = su -c
-# rootdir to setup the chroot environment
-# can contain %(repo)s, %(arch)s, %(project)s and %(package)s for replacement, e.g.
-# /srv/oscbuild/%(repo)s-%(arch)s or
-# /srv/oscbuild/%(repo)s-%(arch)s-%(project)s-%(package)s
-#build-root = /var/tmp/build-root
-# compile with N jobs (default: "getconf _NPROCESSORS_ONLN")
-#build-jobs = N
-# build-type to use - values can be (depending on the capabilities of the 'build' script)
-# empty - chroot build
-# kvm - kvm VM build (needs build-device, build-swap, build-memory)
-# xen - xen VM build (needs build-device, build-swap, build-memory)
-# experimental:
-# qemu - qemu VM build
-# lxc - lxc build
-#build-type =
-# build-device is the disk-image file to use as root for VM builds
-# e.g. /var/tmp/FILE.root
-#build-device = /var/tmp/FILE.root
-# build-swap is the disk-image to use as swap for VM builds
-# e.g. /var/tmp/FILE.swap
-#build-swap = /var/tmp/FILE.swap
-# build-memory is the amount of memory used in the VM
-# value in MB - e.g. 512
-#build-memory = 512
-# build-vmdisk-rootsize is the size of the disk-image used as root in a VM build
-# values in MB - e.g. 4096
-#build-vmdisk-rootsize = 4096
-# build-vmdisk-swapsize is the size of the disk-image used as swap in a VM build
-# values in MB - e.g. 1024
-#build-vmdisk-swapsize = 1024
-# Numeric uid:gid to assign to the "abuild" user in the build-root
-# or "caller" to use the current users uid:gid
-# This is convenient when sharing the buildroot with ordinary userids
-# on the host.
-# This should not be 0
-# build-uid =
-# extra packages to install when building packages locally (osc build)
-# this corresponds to osc build's -x option and can be overridden with that
-# -x '' can also be given on the command line to override this setting, or
-# you can have an empty setting here.
-#extra-pkgs = vim gdb strace
-# build platform is used if the platform argument is omitted to osc build
-#build_repository = openSUSE_Factory
-# default project for getpac or bco
-#getpac_default_project = openSUSE:Factory
-# alternate filesystem layout: have multiple subdirs, where colons were.
-#checkout_no_colon = 0
-# local files to ignore with status, addremove, ....
-#exclude_glob = .osc CVS .svn .* _linkerror *~ #*# *.orig *.bak *.changes.*
-# keep passwords in plaintext. If you see this comment, your osc
-# already uses the encrypted password, and only keeps them in plain text
-# for backwards compatibility. Default will change to 0 in future releases.
-# You can remove the plaintext password without harm, if you do not need
-# backwards compatibility.
-#plaintext_passwd = 1
-# limit the age of requests shown with 'osc req list'.
-# this is a default only, can be overridden by 'osc req list -D NNN'
-# Use 0 for unlimted.
-#request_list_days = 0
-# show info useful for debugging
-#debug = 1
-# show HTTP traffic useful for debugging
-#http_debug = 1
-# Skip signature verification of packages used for build.
-#no_verify = 1
-# jump into the debugger in case of errors
-#post_mortem = 1
-# print call traces in case of errors
-#traceback = 1
-# use KDE/Gnome/MacOS/Windows keyring for credentials if available
-#use_keyring = 1
-# check for unversioned/removed files before commit
-#check_filelist = 1
-# check for pending requests after executing an action (e.g. checkout, update, commit)
-#check_for_request_on_action = 0
-# what to do with the source package if the submitrequest has been accepted. If
-# nothing is specified the API default is used
-#submitrequest_on_accept_action = cleanup|update|noupdate
-#review requests interactively (default: off)
-#request_show_review = 1
-# Directory with executables to validate sources, esp before committing
-#source_validator_directory = /usr/lib/osc/source_validators
-
-[http://localhost]
-user=Admin
-pass=opensuse
-# set aliases for this apiurl
-# aliases = foo, bar
-# email used in .changes, unless the one from osc meta prj <user> will be used
-# email =
-# additional headers to pass to a request, e.g. for special authentication
-#http_headers = Host: foofoobar,
-# User: mumblegack
-# Force using of keyring for this API
-#keyring = 1
+++ /dev/null
-http://localhost
+++ /dev/null
-<project name="osctest">
- <package name="conflict" state=" " />
- <package name="simple" state=" " />
- <package name="added" state="A" />
- <package name="deleted" state="D" />
- <package name="missing" state="!" />
- <package name="added_deleted" state="A" />
- <package name="deleted_deleted" state="D" />
-</project>
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory />
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="conflict" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="2abd19de6a38ff2890af64f453df96b1" mtime="1282047303" name="conflict" size="22" />
- <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" />
-</directory>
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This file did change.
+++ /dev/null
-Inconflict
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="conflict" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="2abd19de6a38ff2890af64f453df96b1" mtime="1282047303" name="modified" size="22" />
- <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" />
-</directory>
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-modified
-test
+++ /dev/null
-This file did change.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="conflict" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="2abd19de6a38ff2890af64f453df96b1" mtime="1282047303" name="modified" size="22" />
- <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" />
-</directory>
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This file did change.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="676513fde5797c3785164942c97dfec1" mtime="1283506309" name="missing" size="8" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
- <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" />
- <entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="skipped" size="100" skipped="true" />
-</directory>
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-add
-missing
-missing_added
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-added file
+++ /dev/null
-This file did change.
+++ /dev/null
-[general]
-# URL to access API server, e.g. https://api.opensuse.org
-# you also need a section [https://api.opensuse.org] with the credentials
-apiurl = http://localhost
-# Downloaded packages are cached here. Must be writable by you.
-#packagecachedir = /var/tmp/osbuild-packagecache
-# Wrapper to call build as root (sudo, su -, ...)
-#su-wrapper = su -c
-# rootdir to setup the chroot environment
-# can contain %(repo)s, %(arch)s, %(project)s and %(package)s for replacement, e.g.
-# /srv/oscbuild/%(repo)s-%(arch)s or
-# /srv/oscbuild/%(repo)s-%(arch)s-%(project)s-%(package)s
-#build-root = /var/tmp/build-root
-# compile with N jobs (default: "getconf _NPROCESSORS_ONLN")
-#build-jobs = N
-# build-type to use - values can be (depending on the capabilities of the 'build' script)
-# empty - chroot build
-# kvm - kvm VM build (needs build-device, build-swap, build-memory)
-# xen - xen VM build (needs build-device, build-swap, build-memory)
-# experimental:
-# qemu - qemu VM build
-# lxc - lxc build
-#build-type =
-# build-device is the disk-image file to use as root for VM builds
-# e.g. /var/tmp/FILE.root
-#build-device = /var/tmp/FILE.root
-# build-swap is the disk-image to use as swap for VM builds
-# e.g. /var/tmp/FILE.swap
-#build-swap = /var/tmp/FILE.swap
-# build-memory is the amount of memory used in the VM
-# value in MB - e.g. 512
-#build-memory = 512
-# build-vmdisk-rootsize is the size of the disk-image used as root in a VM build
-# values in MB - e.g. 4096
-#build-vmdisk-rootsize = 4096
-# build-vmdisk-swapsize is the size of the disk-image used as swap in a VM build
-# values in MB - e.g. 1024
-#build-vmdisk-swapsize = 1024
-# Numeric uid:gid to assign to the "abuild" user in the build-root
-# or "caller" to use the current users uid:gid
-# This is convenient when sharing the buildroot with ordinary userids
-# on the host.
-# This should not be 0
-# build-uid =
-# extra packages to install when building packages locally (osc build)
-# this corresponds to osc build's -x option and can be overridden with that
-# -x '' can also be given on the command line to override this setting, or
-# you can have an empty setting here.
-#extra-pkgs = vim gdb strace
-# build platform is used if the platform argument is omitted to osc build
-#build_repository = openSUSE_Factory
-# default project for getpac or bco
-#getpac_default_project = openSUSE:Factory
-# alternate filesystem layout: have multiple subdirs, where colons were.
-#checkout_no_colon = 0
-# local files to ignore with status, addremove, ....
-#exclude_glob = .osc CVS .svn .* _linkerror *~ #*# *.orig *.bak *.changes.*
-# keep passwords in plaintext. If you see this comment, your osc
-# already uses the encrypted password, and only keeps them in plain text
-# for backwards compatibility. Default will change to 0 in future releases.
-# You can remove the plaintext password without harm, if you do not need
-# backwards compatibility.
-#plaintext_passwd = 1
-# limit the age of requests shown with 'osc req list'.
-# this is a default only, can be overridden by 'osc req list -D NNN'
-# Use 0 for unlimted.
-#request_list_days = 0
-# show info useful for debugging
-#debug = 1
-# show HTTP traffic useful for debugging
-#http_debug = 1
-# Skip signature verification of packages used for build.
-#no_verify = 1
-# jump into the debugger in case of errors
-#post_mortem = 1
-# print call traces in case of errors
-#traceback = 1
-# use KDE/Gnome/MacOS/Windows keyring for credentials if available
-#use_keyring = 1
-# check for unversioned/removed files before commit
-#check_filelist = 1
-# check for pending requests after executing an action (e.g. checkout, update, commit)
-#check_for_request_on_action = 0
-# what to do with the source package if the submitrequest has been accepted. If
-# nothing is specified the API default is used
-#submitrequest_on_accept_action = cleanup|update|noupdate
-#review requests interactively (default: off)
-#request_show_review = 1
-# Directory with executables to validate sources, esp before committing
-#source_validator_directory = /usr/lib/osc/source_validators
-
-[http://localhost]
-user=Admin
-pass=opensuse
-# set aliases for this apiurl
-# aliases = foo, bar
-# email used in .changes, unless the one from osc meta prj <user> will be used
-# email =
-# additional headers to pass to a request, e.g. for special authentication
-#http_headers = Host: foofoobar,
-# User: mumblegack
-# Force using of keyring for this API
-#keyring = 1
+++ /dev/null
-http://localhost
+++ /dev/null
-<project name="osctest" />
+++ /dev/null
-<project name="osctest" />
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="buildfiles" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-buildfiles
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-urlwithoutprotocolandtld
+++ /dev/null
-<directory name="invalid_apiurl" rev="1" vrev="1" srcmd5="2738234914de5cc154b1494b1e98d940" />
+++ /dev/null
-<package project="remote" name="foo">
- <title>Title of New Package</title>
- <description>
-LONG DESCRIPTION
-GOES
-HERE
- </description>
- <person userid="Admin" role="maintainer"/>
- <person userid="Admin" role="bugowner"/>
- <url>PUT_UPSTREAM_URL_HERE</url>
-</package>
+++ /dev/null
-invalid_apiurl
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="multiple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-foo
-nofilesentry
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-<directory name="noapiurl" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
\ No newline at end of file
+++ /dev/null
-simple
\ No newline at end of file
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
\ No newline at end of file
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
\ No newline at end of file
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="simple3" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="working_nonempty" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-working_nonempty
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-foo
-remove
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="working_nonempty" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-working_nonempty
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="simple6" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="simple7" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
- <entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="skipped" size="42" skipped="true" />
-</directory>
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="simple8" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
- <entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="skipped" size="42" skipped="true" />
-</directory>
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory />
+++ /dev/null
-working_empty
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="working_nonempty" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-working_nonempty
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-noschemeandnotld
+++ /dev/null
-<project name="prj_noapiurl" />
+++ /dev/null
-prj_invalidapiurl
+++ /dev/null
-<project name="prj_noapiurl" />
+++ /dev/null
-prj_noapiurl
+++ /dev/null
-[general]
-# URL to access API server, e.g. https://api.opensuse.org
-# you also need a section [https://api.opensuse.org] with the credentials
-apiurl = http://localhost
-# Downloaded packages are cached here. Must be writable by you.
-#packagecachedir = /var/tmp/osbuild-packagecache
-# Wrapper to call build as root (sudo, su -, ...)
-#su-wrapper = su -c
-# rootdir to setup the chroot environment
-# can contain %(repo)s, %(arch)s, %(project)s and %(package)s for replacement, e.g.
-# /srv/oscbuild/%(repo)s-%(arch)s or
-# /srv/oscbuild/%(repo)s-%(arch)s-%(project)s-%(package)s
-#build-root = /var/tmp/build-root
-# compile with N jobs (default: "getconf _NPROCESSORS_ONLN")
-#build-jobs = N
-# build-type to use - values can be (depending on the capabilities of the 'build' script)
-# empty - chroot build
-# kvm - kvm VM build (needs build-device, build-swap, build-memory)
-# xen - xen VM build (needs build-device, build-swap, build-memory)
-# experimental:
-# qemu - qemu VM build
-# lxc - lxc build
-#build-type =
-# build-device is the disk-image file to use as root for VM builds
-# e.g. /var/tmp/FILE.root
-#build-device = /var/tmp/FILE.root
-# build-swap is the disk-image to use as swap for VM builds
-# e.g. /var/tmp/FILE.swap
-#build-swap = /var/tmp/FILE.swap
-# build-memory is the amount of memory used in the VM
-# value in MB - e.g. 512
-#build-memory = 512
-# build-vmdisk-rootsize is the size of the disk-image used as root in a VM build
-# values in MB - e.g. 4096
-#build-vmdisk-rootsize = 4096
-# build-vmdisk-swapsize is the size of the disk-image used as swap in a VM build
-# values in MB - e.g. 1024
-#build-vmdisk-swapsize = 1024
-# Numeric uid:gid to assign to the "abuild" user in the build-root
-# or "caller" to use the current users uid:gid
-# This is convenient when sharing the buildroot with ordinary userids
-# on the host.
-# This should not be 0
-# build-uid =
-# extra packages to install when building packages locally (osc build)
-# this corresponds to osc build's -x option and can be overridden with that
-# -x '' can also be given on the command line to override this setting, or
-# you can have an empty setting here.
-#extra-pkgs = vim gdb strace
-# build platform is used if the platform argument is omitted to osc build
-#build_repository = openSUSE_Factory
-# default project for getpac or bco
-#getpac_default_project = openSUSE:Factory
-# alternate filesystem layout: have multiple subdirs, where colons were.
-#checkout_no_colon = 0
-# local files to ignore with status, addremove, ....
-#exclude_glob = .osc CVS .svn .* _linkerror *~ #*# *.orig *.bak *.changes.*
-# keep passwords in plaintext. If you see this comment, your osc
-# already uses the encrypted password, and only keeps them in plain text
-# for backwards compatibility. Default will change to 0 in future releases.
-# You can remove the plaintext password without harm, if you do not need
-# backwards compatibility.
-#plaintext_passwd = 1
-# limit the age of requests shown with 'osc req list'.
-# this is a default only, can be overridden by 'osc req list -D NNN'
-# Use 0 for unlimted.
-#request_list_days = 0
-# show info useful for debugging
-#debug = 1
-# show HTTP traffic useful for debugging
-#http_debug = 1
-# Skip signature verification of packages used for build.
-#no_verify = 1
-# jump into the debugger in case of errors
-#post_mortem = 1
-# print call traces in case of errors
-#traceback = 1
-# use KDE/Gnome/MacOS/Windows keyring for credentials if available
-#use_keyring = 1
-# check for unversioned/removed files before commit
-#check_filelist = 1
-# check for pending requests after executing an action (e.g. checkout, update, commit)
-#check_for_request_on_action = 0
-# what to do with the source package if the submitrequest has been accepted. If
-# nothing is specified the API default is used
-#submitrequest_on_accept_action = cleanup|update|noupdate
-#review requests interactively (default: off)
-#request_show_review = 1
-# Directory with executables to validate sources, esp before committing
-#source_validator_directory = /usr/lib/osc/source_validators
-
-[http://localhost]
-user=Admin
-pass=opensuse
-# set aliases for this apiurl
-# aliases = foo, bar
-# email used in .changes, unless the one from osc meta prj <user> will be used
-# email =
-# additional headers to pass to a request, e.g. for special authentication
-#http_headers = Host: foofoobar,
-# User: mumblegack
-# Force using of keyring for this API
-#keyring = 1
+++ /dev/null
-<request id="42">
- <action type="submit">
- <source package="bar" project="foo" rev="1" />
- <target package="bar" project="foobar" />
- </action>
- <action type="delete">
- <target project="deleteme" />
- </action>
- <state name="accepted" when="2010-12-27T01:36:29" who="user1" />
- <history name="new" when="2010-12-13T13:02:03" who="creator">
- <comment>foobar</comment>
- </history>
- <title>title of the request</title>
- <description>this is a
-very long
-description</description>
-</request>
+++ /dev/null
-<request id="123">
- <action type="submit">
- <source package="abc" project="xyz" />
- <options>
- <sourceupdate>cleanup</sourceupdate>
- <updatelink>1</updatelink>
- </options>
- </action>
- <action type="add_role">
- <target project="home:foo" />
- <person name="bar" role="maintainer" />
- <group name="groupxyz" role="reader" />
- </action>
- <state name="review" when="2010-12-27T01:36:29" who="abc" />
- <review by_group="group1" state="new" when="2010-12-28T00:11:22" who="abc">
- <comment>review start</comment>
- </review>
- <history name="new" when="2010-12-11T00:00:00" who="creator" />
-</request>
+++ /dev/null
-<request id="62">
- <action type="set_bugowner">
- <target project="foo" />
- <person name="buguser" />
- </action>
- <action type="add_role">
- <target project="foobar" />
- <person name="xyz" role="maintainer" />
- <group name="group1" role="reader" />
- </action>
- <action type="add_role">
- <target project="foo" package="bar" />
- <person name="abc" role="reviewer" />
- </action>
- <action type="change_devel">
- <source project="devprj" package="devpkg" />
- <target project="foo" package="bar" />
- </action>
- <action type="submit">
- <source project="srcprj" package="srcpackage" />
- <target project="tgtprj" package="tgtpackage" />
- </action>
- <action type="submit">
- <source project="foo" package="bar" />
- <target project="baz" />
- </action>
- <action type="delete">
- <target project="deleteme" />
- </action>
- <action type="delete">
- <target project="foo" package="bar" />
- </action>
- <state name="new" when="2010-12-29T14:57:25" who="Admin">
- <comment></comment>
- </state>
-</request>
+++ /dev/null
-<request id="21">
- <action type="set_bugowner">
- <target project="foo" />
- <person name="buguser" />
- </action>
- <state name="accepted" when="2010-12-29T16:37:45" who="foobar" />
- <history name="new" when="2010-12-28T16:37:45" who="user" />
- <history name="review" when="2010-12-28T18:37:45" who="foobar" />
- <description>This is
-a simple request with a lot of ... ... text and other stuff. This request also contains a
-description. This is useful to
-describe the request. blabla
-blabla</description>
-</request>
+++ /dev/null
-<request id="123">
- <action type="submit">
- <source package="abc" project="xyz" />
- <target project="foo" />
- <options>
- <sourceupdate>cleanup</sourceupdate>
- <updatelink>1</updatelink>
- </options>
- </action>
- <action type="add_role">
- <target project="home:foo" />
- <person name="bar" role="maintainer" />
- <group name="groupxyz" role="reader" />
- </action>
- <state name="review" when="2010-12-27T01:36:29" who="abc">
- <comment>currently in review</comment>
- </state>
- <review by_group="group1" state="new" when="2010-12-28T00:11:22" who="abc">
- <comment>review start</comment>
- </review>
- <review by_group="group1" state="accepted" when="2010-12-29T00:11:22" who="abc">
- <comment>accepted</comment>
- </review>
- <history name="new" when="2010-12-11T00:00:00" who="creator" />
- <history name="revoked" when="2010-12-12T00:00:00" who="creator" />
- <description>just a samll description
-in order to describe this
-request - blablabla
-test.</description>
-</request>
+++ /dev/null
-[general]
-# URL to access API server, e.g. https://api.opensuse.org
-# you also need a section [https://api.opensuse.org] with the credentials
-apiurl = http://localhost
-# Downloaded packages are cached here. Must be writable by you.
-#packagecachedir = /var/tmp/osbuild-packagecache
-# Wrapper to call build as root (sudo, su -, ...)
-#su-wrapper = su -c
-# rootdir to setup the chroot environment
-# can contain %(repo)s, %(arch)s, %(project)s and %(package)s for replacement, e.g.
-# /srv/oscbuild/%(repo)s-%(arch)s or
-# /srv/oscbuild/%(repo)s-%(arch)s-%(project)s-%(package)s
-#build-root = /var/tmp/build-root
-# compile with N jobs (default: "getconf _NPROCESSORS_ONLN")
-#build-jobs = N
-# build-type to use - values can be (depending on the capabilities of the 'build' script)
-# empty - chroot build
-# kvm - kvm VM build (needs build-device, build-swap, build-memory)
-# xen - xen VM build (needs build-device, build-swap, build-memory)
-# experimental:
-# qemu - qemu VM build
-# lxc - lxc build
-#build-type =
-# build-device is the disk-image file to use as root for VM builds
-# e.g. /var/tmp/FILE.root
-#build-device = /var/tmp/FILE.root
-# build-swap is the disk-image to use as swap for VM builds
-# e.g. /var/tmp/FILE.swap
-#build-swap = /var/tmp/FILE.swap
-# build-memory is the amount of memory used in the VM
-# value in MB - e.g. 512
-#build-memory = 512
-# build-vmdisk-rootsize is the size of the disk-image used as root in a VM build
-# values in MB - e.g. 4096
-#build-vmdisk-rootsize = 4096
-# build-vmdisk-swapsize is the size of the disk-image used as swap in a VM build
-# values in MB - e.g. 1024
-#build-vmdisk-swapsize = 1024
-# Numeric uid:gid to assign to the "abuild" user in the build-root
-# or "caller" to use the current users uid:gid
-# This is convenient when sharing the buildroot with ordinary userids
-# on the host.
-# This should not be 0
-# build-uid =
-# extra packages to install when building packages locally (osc build)
-# this corresponds to osc build's -x option and can be overridden with that
-# -x '' can also be given on the command line to override this setting, or
-# you can have an empty setting here.
-#extra-pkgs = vim gdb strace
-# build platform is used if the platform argument is omitted to osc build
-#build_repository = openSUSE_Factory
-# default project for getpac or bco
-#getpac_default_project = openSUSE:Factory
-# alternate filesystem layout: have multiple subdirs, where colons were.
-#checkout_no_colon = 0
-# local files to ignore with status, addremove, ....
-#exclude_glob = .osc CVS .svn .* _linkerror *~ #*# *.orig *.bak *.changes.*
-# keep passwords in plaintext. If you see this comment, your osc
-# already uses the encrypted password, and only keeps them in plain text
-# for backwards compatibility. Default will change to 0 in future releases.
-# You can remove the plaintext password without harm, if you do not need
-# backwards compatibility.
-#plaintext_passwd = 1
-# limit the age of requests shown with 'osc req list'.
-# this is a default only, can be overridden by 'osc req list -D NNN'
-# Use 0 for unlimted.
-#request_list_days = 0
-# show info useful for debugging
-#debug = 1
-# show HTTP traffic useful for debugging
-#http_debug = 1
-# Skip signature verification of packages used for build.
-#no_verify = 1
-# jump into the debugger in case of errors
-#post_mortem = 1
-# print call traces in case of errors
-#traceback = 1
-# use KDE/Gnome/MacOS/Windows keyring for credentials if available
-#use_keyring = 1
-# check for unversioned/removed files before commit
-#check_filelist = 1
-# check for pending requests after executing an action (e.g. checkout, update, commit)
-#check_for_request_on_action = 0
-# what to do with the source package if the submitrequest has been accepted. If
-# nothing is specified the API default is used
-#submitrequest_on_accept_action = cleanup|update|noupdate
-#review requests interactively (default: off)
-#request_show_review = 1
-# Directory with executables to validate sources, esp before committing
-#source_validator_directory = /usr/lib/osc/source_validators
-
-[http://localhost]
-user=Admin
-pass=opensuse
-# set aliases for this apiurl
-# aliases = foo, bar
-# email used in .changes, unless the one from osc meta prj <user> will be used
-# email =
-# additional headers to pass to a request, e.g. for special authentication
-#http_headers = Host: foofoobar,
-# User: mumblegack
-# Force using of keyring for this API
-#keyring = 1
+++ /dev/null
-http://localhost
+++ /dev/null
-<project name="osctest" />
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="conflict" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
- <entry md5="eb9c2bf0eb63f3a7bc0ea37ef18aeba5" mtime="1282730880" name="somefile" size="13" />
- <entry md5="81be947db54c2e225dc8eacce64d8a4a" mtime="1282731457" name="replaced" size="17" />
- <entry md5="676513fde5797c3785164942c97dfec1" mtime="1282731738" name="missing" size="8" />
- <entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="deleted" size="9" />
- <entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="skipped" size="12" skipped="true" />
-</directory>
+++ /dev/null
-simple
\ No newline at end of file
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-toadd1
-replaced
-addedmissing
+++ /dev/null
-somefile
-deleted
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-yet another file
+++ /dev/null
-some content
+++ /dev/null
-<<<<<<< foo.mine
-This is no test.
-=======
-This is a simple test.
->>>>>>> foo.r2
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-foo replaced
+++ /dev/null
-<directory name="srcpkg" rev="abcdeeeeeeeeeeeeeeeeeeeeeeeeeeee" srcmd5="abcdeeeeeeeeeeeeeeeeeeeeeeeeeeee" vrev="1">
- <linkinfo project="srcsrcprj" package="srcsrcpkg" srcmd5="bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" baserev="bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" xsrcmd5="abcdeeeeeeeeeeeeeeeeeeeeeeeeeeee" lsrcmd5="cccccccccccccccccccccccccccccccc" />
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="_link" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
-</directory>
+++ /dev/null
-<directory name="srcpkg" rev="eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" srcmd5="eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" vrev="1">
- <linkinfo project="srcsrcprj" package="srcsrcpkg" srcmd5="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" baserev="bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" xsrcmd5="eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" lsrcmd5="cccccccccccccccccccccccccccccccc" />
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="_link" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
-</directory>
+++ /dev/null
-<link package="srcpkg" />
+++ /dev/null
-[general]
-# URL to access API server, e.g. https://api.opensuse.org
-# you also need a section [https://api.opensuse.org] with the credentials
-apiurl = http://localhost
-# Downloaded packages are cached here. Must be writable by you.
-#packagecachedir = /var/tmp/osbuild-packagecache
-# Wrapper to call build as root (sudo, su -, ...)
-#su-wrapper = su -c
-# rootdir to setup the chroot environment
-# can contain %(repo)s, %(arch)s, %(project)s and %(package)s for replacement, e.g.
-# /srv/oscbuild/%(repo)s-%(arch)s or
-# /srv/oscbuild/%(repo)s-%(arch)s-%(project)s-%(package)s
-#build-root = /var/tmp/build-root
-# compile with N jobs (default: "getconf _NPROCESSORS_ONLN")
-#build-jobs = N
-# build-type to use - values can be (depending on the capabilities of the 'build' script)
-# empty - chroot build
-# kvm - kvm VM build (needs build-device, build-swap, build-memory)
-# xen - xen VM build (needs build-device, build-swap, build-memory)
-# experimental:
-# qemu - qemu VM build
-# lxc - lxc build
-#build-type =
-# build-device is the disk-image file to use as root for VM builds
-# e.g. /var/tmp/FILE.root
-#build-device = /var/tmp/FILE.root
-# build-swap is the disk-image to use as swap for VM builds
-# e.g. /var/tmp/FILE.swap
-#build-swap = /var/tmp/FILE.swap
-# build-memory is the amount of memory used in the VM
-# value in MB - e.g. 512
-#build-memory = 512
-# build-vmdisk-rootsize is the size of the disk-image used as root in a VM build
-# values in MB - e.g. 4096
-#build-vmdisk-rootsize = 4096
-# build-vmdisk-swapsize is the size of the disk-image used as swap in a VM build
-# values in MB - e.g. 1024
-#build-vmdisk-swapsize = 1024
-# Numeric uid:gid to assign to the "abuild" user in the build-root
-# or "caller" to use the current users uid:gid
-# This is convenient when sharing the buildroot with ordinary userids
-# on the host.
-# This should not be 0
-# build-uid =
-# extra packages to install when building packages locally (osc build)
-# this corresponds to osc build's -x option and can be overridden with that
-# -x '' can also be given on the command line to override this setting, or
-# you can have an empty setting here.
-#extra-pkgs = vim gdb strace
-# build platform is used if the platform argument is omitted to osc build
-#build_repository = openSUSE_Factory
-# default project for getpac or bco
-#getpac_default_project = openSUSE:Factory
-# alternate filesystem layout: have multiple subdirs, where colons were.
-#checkout_no_colon = 0
-# local files to ignore with status, addremove, ....
-#exclude_glob = .osc CVS .svn .* _linkerror *~ #*# *.orig *.bak *.changes.*
-# keep passwords in plaintext. If you see this comment, your osc
-# already uses the encrypted password, and only keeps them in plain text
-# for backwards compatibility. Default will change to 0 in future releases.
-# You can remove the plaintext password without harm, if you do not need
-# backwards compatibility.
-#plaintext_passwd = 1
-# limit the age of requests shown with 'osc req list'.
-# this is a default only, can be overridden by 'osc req list -D NNN'
-# Use 0 for unlimted.
-#request_list_days = 0
-# show info useful for debugging
-#debug = 1
-# show HTTP traffic useful for debugging
-#http_debug = 1
-# Skip signature verification of packages used for build.
-#no_verify = 1
-# jump into the debugger in case of errors
-#post_mortem = 1
-# print call traces in case of errors
-#traceback = 1
-# use KDE/Gnome/MacOS/Windows keyring for credentials if available
-#use_keyring = 1
-# check for unversioned/removed files before commit
-#check_filelist = 1
-# check for pending requests after executing an action (e.g. checkout, update, commit)
-#check_for_request_on_action = 0
-# what to do with the source package if the submitrequest has been accepted. If
-# nothing is specified the API default is used
-#submitrequest_on_accept_action = cleanup|update|noupdate
-#review requests interactively (default: off)
-#request_show_review = 1
-# Directory with executables to validate sources, esp before committing
-#source_validator_directory = /usr/lib/osc/source_validators
-
-[http://localhost]
-user=Admin
-pass=opensuse
-# set aliases for this apiurl
-# aliases = foo, bar
-# email used in .changes, unless the one from osc meta prj <user> will be used
-# email =
-# additional headers to pass to a request, e.g. for special authentication
-#http_headers = Host: foofoobar,
-# User: mumblegack
-# Force using of keyring for this API
-#keyring = 1
+++ /dev/null
-<link package="srcpkg" project="srcprj" rev="42" />
+++ /dev/null
-<directory name="srcpkg" rev="42" srcmd5="ffffffffffffffffffffffffffffffff" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
-</directory>
+++ /dev/null
-<link package="srcpkg" project="srcprj" />
+++ /dev/null
-import os.path
-import sys
-import unittest
-
-try:
- import xmlrunner # JUnit like XML reporting
- have_xmlrunner = True
-except ImportError:
- have_xmlrunner = False
-
-import test_update
-import test_addfiles
-import test_deletefiles
-import test_revertfiles
-import test_difffiles
-import test_init_package
-import test_init_project
-import test_commit
-import test_repairwc
-import test_package_status
-import test_project_status
-import test_request
-import test_setlinkrev
-import test_prdiff
-
-suite = unittest.TestSuite()
-suite.addTests(test_addfiles.suite())
-suite.addTests(test_deletefiles.suite())
-suite.addTests(test_revertfiles.suite())
-suite.addTests(test_update.suite())
-suite.addTests(test_difffiles.suite())
-suite.addTests(test_init_package.suite())
-suite.addTests(test_init_project.suite())
-suite.addTests(test_commit.suite())
-suite.addTests(test_repairwc.suite())
-suite.addTests(test_package_status.suite())
-suite.addTests(test_project_status.suite())
-suite.addTests(test_request.suite())
-suite.addTests(test_setlinkrev.suite())
-suite.addTests(test_prdiff.suite())
-
-if have_xmlrunner:
- result = xmlrunner.XMLTestRunner(output=os.path.join(os.getcwd(), 'junit-xml-results')).run(suite)
-else:
- result = unittest.TextTestRunner(verbosity=1).run(suite)
-sys.exit(not result.wasSuccessful())
+++ /dev/null
-import osc.core
-import osc.oscerr
-import os
-import sys
-from common import OscTestCase
-
-FIXTURES_DIR = os.path.join(os.getcwd(), 'addfile_fixtures')
-
-def suite():
- import unittest
- return unittest.makeSuite(TestAddFiles)
-
-class TestAddFiles(OscTestCase):
- def _get_fixtures_dir(self):
- return FIXTURES_DIR
-
- def testSimpleAdd(self):
- """add one file ('toadd1') to the wc"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.addfile('toadd1')
- exp = 'A toadd1\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self.assertFalse(os.path.exists(os.path.join('.osc', 'toadd1')))
- self._check_status(p, 'toadd1', 'A')
- self._check_addlist('toadd1\n')
-
- def testSimpleMultipleAdd(self):
- """add multiple files ('toadd1', 'toadd2') to the wc"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.addfile('toadd1')
- p.addfile('toadd2')
- exp = 'A toadd1\nA toadd2\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self.assertFalse(os.path.exists(os.path.join('.osc', 'toadd1')))
- self.assertFalse(os.path.exists(os.path.join('.osc', 'toadd2')))
- self._check_status(p, 'toadd1', 'A')
- self._check_status(p, 'toadd2', 'A')
- self._check_addlist('toadd1\ntoadd2\n')
-
- def testAddVersionedFile(self):
- """add a versioned file"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- self.assertRaises(osc.oscerr.PackageFileConflict, p.addfile, 'merge')
- self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_added')))
- self._check_status(p, 'merge', ' ')
-
- def testAddUnversionedFileTwice(self):
- """add the same file twice"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.addfile('toadd1')
- self.assertRaises(osc.oscerr.PackageFileConflict, p.addfile, 'toadd1')
- exp = 'A toadd1\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self.assertFalse(os.path.exists(os.path.join('.osc', 'toadd1')))
- self._check_status(p, 'toadd1', 'A')
- self._check_addlist('toadd1\n')
-
- def testReplace(self):
- """replace a deleted file ('foo')"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- open('foo', 'w').write('replaced file\n')
- p.addfile('foo')
- exp = 'A foo\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self.assertTrue(os.path.exists(os.path.join('.osc', 'foo')))
- self.assertNotEqual(open(os.path.join('.osc', 'foo'), 'r').read(), 'replaced file\n')
- self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted')))
- self._check_status(p, 'foo', 'R')
- self._check_addlist('foo\n')
-
- def testAddNonExistentFile(self):
- """add a non existent file"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- self.assertRaises(osc.oscerr.OscIOError, p.addfile, 'doesnotexist')
- self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_added')))
-
-if __name__ == '__main__':
- import unittest
- unittest.main()
+++ /dev/null
-import osc.core
-import osc.oscerr
-import os
-import sys
-from common import GET, PUT, POST, DELETE, OscTestCase
-from xml.etree import cElementTree as ET
-FIXTURES_DIR = os.path.join(os.getcwd(), 'commit_fixtures')
-
-def suite():
- import unittest
- return unittest.makeSuite(TestCommit)
-
-rev_dummy = '<revision rev="repository">\n <srcmd5>empty</srcmd5>\n</revision>'
-
-class TestCommit(OscTestCase):
- def _get_fixtures_dir(self):
- return FIXTURES_DIR
-
- @GET('http://localhost/source/osctest/simple?rev=latest', file='testSimple_filesremote')
- @POST('http://localhost/source/osctest/simple?cmd=getprojectservices',
- exp='', text='<services />')
- @POST('http://localhost/source/osctest/simple?comment=&cmd=commitfilelist&user=Admin',
- file='testSimple_missingfilelist', expfile='testSimple_lfilelist')
- @PUT('http://localhost/source/osctest/simple/nochange?rev=repository',
- exp='This file didn\'t change but\nis modified.\n', text=rev_dummy)
- @POST('http://localhost/source/osctest/simple?comment=&cmd=commitfilelist&user=Admin',
- file='testSimple_cfilesremote', expfile='testSimple_lfilelist')
- def test_simple(self):
- """a simple commit (only one modified file)"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.commit()
- exp = 'Sending nochange\nTransmitting file data .\nCommitted revision 2.\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self._check_digests('testSimple_cfilesremote')
- self.assertTrue(os.path.exists('nochange'))
- self.assertEqual(open('nochange', 'r').read(), open(os.path.join('.osc', 'nochange'), 'r').read())
- self._check_status(p, 'nochange', ' ')
- self._check_status(p, 'foo', ' ')
- self._check_status(p, 'merge', ' ')
-
- @GET('http://localhost/source/osctest/add?rev=latest', file='testAddfile_filesremote')
- @POST('http://localhost/source/osctest/add?cmd=getprojectservices',
- exp='', text='<services />')
- @POST('http://localhost/source/osctest/add?comment=&cmd=commitfilelist&user=Admin',
- file='testAddfile_missingfilelist', expfile='testAddfile_lfilelist')
- @PUT('http://localhost/source/osctest/add/add?rev=repository',
- exp='added file\n', text=rev_dummy)
- @POST('http://localhost/source/osctest/add?comment=&cmd=commitfilelist&user=Admin',
- file='testAddfile_cfilesremote', expfile='testAddfile_lfilelist')
- def test_addfile(self):
- """commit a new file"""
- self._change_to_pkg('add')
- p = osc.core.Package('.')
- p.commit()
- exp = 'Sending add\nTransmitting file data .\nCommitted revision 2.\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self._check_digests('testAddfile_cfilesremote')
- self.assertTrue(os.path.exists('add'))
- self.assertEqual(open('add', 'r').read(), open(os.path.join('.osc', 'add'), 'r').read())
- self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_added')))
- self._check_status(p, 'add', ' ')
- self._check_status(p, 'foo', ' ')
- self._check_status(p, 'merge', ' ')
- self._check_status(p, 'nochange', ' ')
-
- @GET('http://localhost/source/osctest/delete?rev=latest', file='testDeletefile_filesremote')
- @POST('http://localhost/source/osctest/delete?cmd=getprojectservices',
- exp='', text='<services />')
- @POST('http://localhost/source/osctest/delete?comment=&cmd=commitfilelist&user=Admin',
- file='testDeletefile_cfilesremote', expfile='testDeletefile_lfilelist')
- def test_deletefile(self):
- """delete a file"""
- self._change_to_pkg('delete')
- p = osc.core.Package('.')
- p.commit()
- exp = 'Deleting nochange\nTransmitting file data \nCommitted revision 2.\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self._check_digests('testDeletefile_cfilesremote')
- self.assertFalse(os.path.exists('nochange'))
- self.assertFalse(os.path.exists(os.path.join('.osc', 'nochange')))
- self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted')))
- self._check_status(p, 'foo', ' ')
- self._check_status(p, 'merge', ' ')
-
- @GET('http://localhost/source/osctest/conflict?rev=latest', file='testConflictfile_filesremote')
- @POST('http://localhost/source/osctest/conflict?cmd=getprojectservices',
- exp='', text='<services />')
- def test_conflictfile(self):
- """package has a file which is in conflict state"""
- self._change_to_pkg('conflict')
- ret = osc.core.Package('.').commit()
- self.assertTrue(ret == 1)
- exp = 'Please resolve all conflicts before committing using "osc resolved FILE"!\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self._check_digests('testConflictfile_filesremote')
- self._check_conflictlist('merge\n')
-
- @GET('http://localhost/source/osctest/nochanges?rev=latest', file='testNoChanges_filesremote')
- @POST('http://localhost/source/osctest/nochanges?cmd=getprojectservices',
- exp='', text='<services />')
- def test_nochanges(self):
- """package has no changes (which can be committed)"""
- self._change_to_pkg('nochanges')
- p = osc.core.Package('.')
- ret = p.commit()
- self.assertTrue(ret == 1)
- exp = 'nothing to do for package nochanges\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self._check_status(p, 'foo', 'S')
- self._check_status(p, 'merge', '!')
- self._check_status(p, 'nochange', ' ')
-
- @GET('http://localhost/source/osctest/multiple?rev=latest', file='testMultiple_filesremote')
- @POST('http://localhost/source/osctest/multiple?cmd=getprojectservices',
- exp='', text='<services />')
- @POST('http://localhost/source/osctest/multiple?comment=&cmd=commitfilelist&user=Admin',
- file='testMultiple_missingfilelist', expfile='testMultiple_lfilelist')
- @PUT('http://localhost/source/osctest/multiple/nochange?rev=repository', exp='This file did change.\n', text=rev_dummy)
- @PUT('http://localhost/source/osctest/multiple/add?rev=repository', exp='added file\n', text=rev_dummy)
- @PUT('http://localhost/source/osctest/multiple/add2?rev=repository', exp='add2\n', text=rev_dummy)
- @POST('http://localhost/source/osctest/multiple?comment=&cmd=commitfilelist&user=Admin',
- file='testMultiple_cfilesremote', expfile='testMultiple_lfilelist')
- def test_multiple(self):
- """a simple commit (only one modified file)"""
- self._change_to_pkg('multiple')
- p = osc.core.Package('.')
- p.commit()
- exp = 'Deleting foo\nDeleting merge\nSending nochange\n' \
- 'Sending add\nSending add2\nTransmitting file data ...\nCommitted revision 2.\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self._check_digests('testMultiple_cfilesremote')
- self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_added')))
- self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted')))
- self.assertFalse(os.path.exists(os.path.join('.osc', 'foo')))
- self.assertFalse(os.path.exists(os.path.join('.osc', 'merge')))
- self.assertRaises(osc.oscerr.OscIOError, p.status, 'foo')
- self.assertRaises(osc.oscerr.OscIOError, p.status, 'merge')
- self._check_status(p, 'add', ' ')
- self._check_status(p, 'add2', ' ')
- self._check_status(p, 'nochange', ' ')
-
- @GET('http://localhost/source/osctest/multiple?rev=latest', file='testPartial_filesremote')
- @POST('http://localhost/source/osctest/multiple?cmd=getprojectservices',
- exp='', text='<services />')
- @POST('http://localhost/source/osctest/multiple?comment=&cmd=commitfilelist&user=Admin',
- file='testPartial_missingfilelist', expfile='testPartial_lfilelist')
- @PUT('http://localhost/source/osctest/multiple/add?rev=repository', exp='added file\n', text=rev_dummy)
- @PUT('http://localhost/source/osctest/multiple/nochange?rev=repository', exp='This file did change.\n', text=rev_dummy)
- @POST('http://localhost/source/osctest/multiple?comment=&cmd=commitfilelist&user=Admin',
- file='testPartial_cfilesremote', expfile='testPartial_lfilelist')
- def test_partial(self):
- """commit only some files"""
- self._change_to_pkg('multiple')
- p = osc.core.Package('.')
- p.todo = ['foo', 'add', 'nochange']
- p.commit()
- exp = 'Deleting foo\nSending nochange\n' \
- 'Sending add\nTransmitting file data ..\nCommitted revision 2.\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self._check_digests('testPartial_cfilesremote')
- self._check_addlist('add2\n')
- self._check_deletelist('merge\n')
- self._check_status(p, 'add2', 'A')
- self._check_status(p, 'merge', 'D')
- self._check_status(p, 'add', ' ')
- self._check_status(p, 'nochange', ' ')
- self.assertRaises(osc.oscerr.OscIOError, p.status, 'foo')
-
- @GET('http://localhost/source/osctest/simple?rev=latest', file='testSimple_filesremote')
- @POST('http://localhost/source/osctest/simple?cmd=getprojectservices',
- exp='', text='<services />')
- @POST('http://localhost/source/osctest/simple?comment=&cmd=commitfilelist&user=Admin',
- file='testSimple_missingfilelist', expfile='testSimple_lfilelist')
- @PUT('http://localhost/source/osctest/simple/nochange?rev=repository', exp='This file didn\'t change but\nis modified.\n',
- exception=IOError('test exception'), text=rev_dummy)
- def test_interrupt(self):
- """interrupt a commit"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- self.assertRaises(IOError, p.commit)
- exp = 'Sending nochange\nTransmitting file data .'
- self.assertTrue(sys.stdout.getvalue(), exp)
- self._check_digests('testSimple_filesremote')
- self.assertTrue(os.path.exists('nochange'))
- self._check_status(p, 'nochange', 'M')
-
- @GET('http://localhost/source/osctest/allstates?rev=latest', file='testPartial_filesremote')
- @POST('http://localhost/source/osctest/allstates?cmd=getprojectservices',
- exp='', text='<services />')
- @POST('http://localhost/source/osctest/allstates?comment=&cmd=commitfilelist&user=Admin',
- file='testAllStates_missingfilelist', expfile='testAllStates_lfilelist')
- @PUT('http://localhost/source/osctest/allstates/add?rev=repository', exp='added file\n', text=rev_dummy)
- @PUT('http://localhost/source/osctest/allstates/missing?rev=repository', exp='replaced\n', text=rev_dummy)
- @PUT('http://localhost/source/osctest/allstates/nochange?rev=repository', exp='This file did change.\n', text=rev_dummy)
- @POST('http://localhost/source/osctest/allstates?comment=&cmd=commitfilelist&user=Admin',
- file='testAllStates_cfilesremote', expfile='testAllStates_lfilelist')
- def test_allstates(self):
- """commit all files (all states are available except 'C')"""
- self._change_to_pkg('allstates')
- p = osc.core.Package('.')
- p.commit()
- exp = 'Deleting foo\nSending missing\nSending nochange\n' \
- 'Sending add\nTransmitting file data ...\nCommitted revision 2.\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self._check_digests('testAllStates_expfiles', 'skipped')
- self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_added')))
- self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted')))
- self.assertFalse(os.path.exists('foo'))
- self.assertFalse(os.path.exists(os.path.join('.osc', 'foo')))
- self._check_status(p, 'add', ' ')
- self._check_status(p, 'nochange', ' ')
- self._check_status(p, 'merge', '!')
- self._check_status(p, 'missing', ' ')
- self._check_status(p, 'skipped', 'S')
- self._check_status(p, 'test', ' ')
-
- @GET('http://localhost/source/osctest/add?rev=latest', file='testAddfile_filesremote')
- @POST('http://localhost/source/osctest/add?cmd=getprojectservices',
- exp='', text='<services />')
- @POST('http://localhost/source/osctest/add?comment=&cmd=commitfilelist&user=Admin',
- file='testAddfile_cfilesremote', expfile='testAddfile_lfilelist')
- def test_remoteexists(self):
- """file 'add' should be committed but already exists on the server"""
- self._change_to_pkg('add')
- p = osc.core.Package('.')
- p.commit()
- exp = 'Sending add\nTransmitting file data \nCommitted revision 2.\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self._check_digests('testAddfile_cfilesremote')
- self.assertTrue(os.path.exists('add'))
- self.assertEqual(open('add', 'r').read(), open(os.path.join('.osc', 'add'), 'r').read())
- self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_added')))
- self._check_status(p, 'add', ' ')
- self._check_status(p, 'foo', ' ')
- self._check_status(p, 'merge', ' ')
- self._check_status(p, 'nochange', ' ')
-
- @GET('http://localhost/source/osctest/branch?rev=latest', file='testExpand_filesremote')
- @POST('http://localhost/source/osctest/branch?cmd=getprojectservices',
- exp='', text='<services />')
- @POST('http://localhost/source/osctest/branch?comment=&cmd=commitfilelist&user=Admin&keeplink=1',
- file='testExpand_missingfilelist', expfile='testExpand_lfilelist')
- @PUT('http://localhost/source/osctest/branch/simple?rev=repository', exp='simple modified file.\n', text=rev_dummy)
- @POST('http://localhost/source/osctest/branch?comment=&cmd=commitfilelist&user=Admin&keeplink=1',
- file='testExpand_cfilesremote', expfile='testExpand_lfilelist')
- @GET('http://localhost/source/osctest/branch?rev=87ea02aede261b0267aabaa97c756e7a', file='testExpand_expandedfilesremote')
- def test_expand(self):
- """commit an expanded package"""
- self._change_to_pkg('branch')
- p = osc.core.Package('.')
- p.commit()
- exp = 'Sending simple\nTransmitting file data .\nCommitted revision 7.\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self._check_digests('testExpand_expandedfilesremote')
- self._check_status(p, 'simple', ' ')
-
- @GET('http://localhost/source/osctest/added_missing?rev=latest', file='testAddedMissing_filesremote')
- @POST('http://localhost/source/osctest/added_missing?cmd=getprojectservices',
- exp='', text='<services />')
- def test_added_missing(self):
- """commit an added file which is missing"""
- self._change_to_pkg('added_missing')
- p = osc.core.Package('.')
- ret = p.commit()
- self.assertTrue(ret == 1)
- exp = 'file \'add\' is marked as \'A\' but does not exist\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self._check_status(p, 'add', '!')
-
- @GET('http://localhost/source/osctest/added_missing?rev=latest', file='testAddedMissing_filesremote')
- @POST('http://localhost/source/osctest/added_missing?cmd=getprojectservices',
- exp='', text='<services />')
- @POST('http://localhost/source/osctest/added_missing?comment=&cmd=commitfilelist&user=Admin',
- file='testAddedMissing_missingfilelist', expfile='testAddedMissing_lfilelist')
- @PUT('http://localhost/source/osctest/added_missing/bar?rev=repository', exp='foobar\n', text=rev_dummy)
- @POST('http://localhost/source/osctest/added_missing?comment=&cmd=commitfilelist&user=Admin',
- file='testAddedMissing_cfilesremote', expfile='testAddedMissing_lfilelist')
- def test_added_missing2(self):
- """commit an added file, another added file missing (but it's not part of the commit)"""
- self._change_to_pkg('added_missing')
- p = osc.core.Package('.')
- p.todo = ['bar']
- p.commit()
- exp = 'Sending bar\nTransmitting file data .\nCommitted revision 2.\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self._check_status(p, 'add', '!')
- self._check_status(p, 'bar', ' ')
-
-if __name__ == '__main__':
- import unittest
- unittest.main()
+++ /dev/null
-import osc.core
-import osc.oscerr
-import os
-from common import OscTestCase
-
-FIXTURES_DIR = os.path.join(os.getcwd(), 'deletefile_fixtures')
-
-def suite():
- import unittest
- return unittest.makeSuite(TestDeleteFiles)
-
-class TestDeleteFiles(OscTestCase):
- def _get_fixtures_dir(self):
- return FIXTURES_DIR
-
- def testSimpleRemove(self):
- """delete a file ('foo') from the wc"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- ret = p.delete_file('foo')
- self.__check_ret(ret, True, ' ')
- self.assertFalse(os.path.exists('foo'))
- self.assertTrue(os.path.exists(os.path.join('.osc', 'foo')))
- self._check_deletelist('foo\n')
- self._check_status(p, 'foo', 'D')
-
- def testDeleteModified(self):
- """delete modified file ('nochange') from the wc (without force)"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- ret = p.delete_file('nochange')
- self.__check_ret(ret, False, 'M')
- self.assertTrue(os.path.exists('nochange'))
- self.assertTrue(os.path.exists(os.path.join('.osc', 'nochange')))
- self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted')))
- self._check_status(p, 'nochange', 'M')
-
- def testDeleteUnversioned(self):
- """delete an unversioned file ('toadd2') from the wc"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- ret = p.delete_file('toadd2')
- self.__check_ret(ret, False, '?')
- self.assertTrue(os.path.exists('toadd2'))
- self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted')))
- self._check_status(p, 'toadd2', '?')
-
- def testDeleteAdded(self):
- """delete an added file ('toadd1') from the wc (without force)"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- ret = p.delete_file('toadd1')
- self.__check_ret(ret, False, 'A')
- self.assertTrue(os.path.exists('toadd1'))
- self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted')))
- self._check_status(p, 'toadd1', 'A')
-
- def testDeleteReplaced(self):
- """delete an added file ('merge') from the wc (without force)"""
- self._change_to_pkg('replace')
- p = osc.core.Package('.')
- ret = p.delete_file('merge')
- self.__check_ret(ret, False, 'R')
- self.assertTrue(os.path.exists('merge'))
- self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted')))
- self._check_addlist('toadd1\nmerge\n')
- self._check_status(p, 'merge', 'R')
-
- def testDeleteConflict(self):
- """delete a file ('foo', state='C') from the wc (without force)"""
- self._change_to_pkg('conflict')
- p = osc.core.Package('.')
- ret = p.delete_file('foo')
- self.__check_ret(ret, False, 'C')
- self.assertTrue(os.path.exists('foo'))
- self.assertTrue(os.path.exists(os.path.join('.osc', 'foo')))
- self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted')))
- self._check_conflictlist('foo\n')
- self._check_status(p, 'foo', 'C')
-
- def testDeleteModifiedForce(self):
- """force deletion modified file ('nochange') from wc"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- ret = p.delete_file('nochange', force=True)
- self.__check_ret(ret, True, 'M')
- self.assertFalse(os.path.exists('nochange'))
- self.assertTrue(os.path.exists(os.path.join('.osc', 'nochange')))
- self._check_deletelist('nochange\n')
- self._check_status(p, 'nochange', 'D')
-
- def testDeleteUnversionedForce(self):
- """delete an unversioned file ('toadd2') from the wc (with force)"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- ret = p.delete_file('toadd2', force=True)
- self.__check_ret(ret, True, '?')
- self.assertFalse(os.path.exists('toadd2'))
- self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted')))
- self.assertRaises(osc.oscerr.OscIOError, p.status, 'toadd2')
-
- def testDeleteAddedForce(self):
- """delete an added file ('toadd1') from the wc (with force)"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- ret = p.delete_file('toadd1', force=True)
- self.__check_ret(ret, True, 'A')
- self.assertFalse(os.path.exists('toadd1'))
- self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted')))
- self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_added')))
- self.assertRaises(osc.oscerr.OscIOError, p.status, 'toadd1')
-
- def testDeleteReplacedForce(self):
- """delete an added file ('merge') from the wc (with force)"""
- self._change_to_pkg('replace')
- p = osc.core.Package('.')
- ret = p.delete_file('merge', force=True)
- self.__check_ret(ret, True, 'R')
- self.assertFalse(os.path.exists('merge'))
- self.assertTrue(os.path.exists(os.path.join('.osc', 'merge')))
- self._check_deletelist('merge\n')
- self._check_addlist('toadd1\n')
- self._check_status(p, 'merge', 'D')
-
- def testDeleteConflictForce(self):
- """delete a file ('foo', state='C') from the wc (with force)"""
- self._change_to_pkg('conflict')
- p = osc.core.Package('.')
- ret = p.delete_file('foo', force=True)
- self.__check_ret(ret, True, 'C')
- self.assertFalse(os.path.exists('foo'))
- self.assertTrue(os.path.exists('foo.r2'))
- self.assertTrue(os.path.exists('foo.mine'))
- self.assertTrue(os.path.exists(os.path.join('.osc', 'foo')))
- self._check_deletelist('foo\n')
- self.assertFalse(os.path.exists(os.path.join('.osc', '_in_conflict')))
- self._check_status(p, 'foo', 'D')
-
- def testDeleteMultiple(self):
- """delete mutliple files from the wc"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- ret = p.delete_file('foo')
- self.__check_ret(ret, True, ' ')
- ret = p.delete_file('merge')
- self.__check_ret(ret, True, ' ')
- self.assertFalse(os.path.exists('foo'))
- self.assertFalse(os.path.exists('merge'))
- self.assertTrue(os.path.exists(os.path.join('.osc', 'foo')))
- self.assertTrue(os.path.exists(os.path.join('.osc', 'merge')))
- self._check_deletelist('foo\nmerge\n')
-
- def testDeleteAlreadyDeleted(self):
- """delete already deleted file from the wc"""
- self._change_to_pkg('already_deleted')
- p = osc.core.Package('.')
- ret = p.delete_file('foo')
- self.__check_ret(ret, True, 'D')
- self.assertFalse(os.path.exists('foo'))
- self.assertTrue(os.path.exists(os.path.join('.osc', 'foo')))
- self._check_deletelist('foo\n')
- self._check_status(p, 'foo', 'D')
-
- def testDeleteAddedMissing(self):
- """
- delete a file which was added to the wc and is removed again
- (via a non osc command). It's current state is '!'
- """
- self._change_to_pkg('delete')
- p = osc.core.Package('.')
- ret = p.delete_file('toadd1')
- self.__check_ret(ret, True, '!')
- self.assertFalse(os.path.exists('toadd1'))
- self.assertFalse(os.path.exists(os.path.join('.osc', 'toadd1')))
- self._check_deletelist('foo\n')
- self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_added')))
-
- def testDeleteSkippedLocalNotExistent(self):
- """
- delete a skipped file: no local file with that name exists
- """
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- ret = p.delete_file('skipped')
- self.__check_ret(ret, False, 'S')
- self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted')))
-
- def testDeleteSkippedLocalExistent(self):
- """
- delete a skipped file: a local file with that name exists and will be deleted
- (for instance _service:* files have status 'S' but a local files might exist)
- """
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- ret = p.delete_file('skipped_exists')
- self.__check_ret(ret, True, 'S')
- self.assertFalse(os.path.exists('skipped_exists'))
- self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted')))
-
- def __check_ret(self, ret, exp1, exp2):
- self.assertTrue(len(ret) == 2)
- self.assertTrue(ret[0] == exp1)
- self.assertTrue(ret[1] == exp2)
-
-if __name__ == '__main__':
- import unittest
- unittest.main()
+++ /dev/null
-import osc.core
-import osc.oscerr
-import os
-import re
-from common import GET, OscTestCase
-
-FIXTURES_DIR = os.path.join(os.getcwd(), 'difffile_fixtures')
-
-def suite():
- import unittest
- return unittest.makeSuite(TestDiffFiles)
-
-class TestDiffFiles(OscTestCase):
- diff_hdr = 'Index: %s\n==================================================================='
- def _get_fixtures_dir(self):
- return FIXTURES_DIR
-
- def testDiffUnmodified(self):
- """diff an unmodified file"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.todo = ['merge']
- self.__check_diff(p, '', None)
-
- def testDiffAdded(self):
- """diff an added file"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.todo = ['toadd1']
- exp = """%s
---- toadd1\t(revision 0)
-+++ toadd1\t(revision 0)
-@@ -0,0 +1,1 @@
-+toadd1
-""" % (TestDiffFiles.diff_hdr % 'toadd1')
- self.__check_diff(p, exp, None)
-
- def testDiffRemoved(self):
- """diff a removed file"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.todo = ['somefile']
- exp = """%s
---- somefile\t(revision 2)
-+++ somefile\t(working copy)
-@@ -1,1 +0,0 @@
--some content
-""" % (TestDiffFiles.diff_hdr % 'somefile')
- self.__check_diff(p, exp, None)
-
- def testDiffMissing(self):
- """diff a missing file (missing files are ignored)"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.todo = ['missing']
- self.__check_diff(p, '', None)
-
- def testDiffReplaced(self):
- """diff a replaced file"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.todo = ['replaced']
- exp = """%s
---- replaced\t(revision 2)
-+++ replaced\t(working copy)
-@@ -1,1 +1,1 @@
--yet another file
-+foo replaced
-""" % (TestDiffFiles.diff_hdr % 'replaced')
- self.__check_diff(p, exp, None)
-
- def testDiffSkipped(self):
- """diff a skipped file (skipped files are ignored)"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.todo = ['skipped']
- self.__check_diff(p, '', None)
-
- def testDiffConflict(self):
- """diff a file which is in the conflict state"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.todo = ['foo']
- exp = """%s
---- foo\t(revision 2)
-+++ foo\t(working copy)
-@@ -1,1 +1,5 @@
-+<<<<<<< foo.mine
-+This is no test.
-+=======
- This is a simple test.
-+>>>>>>> foo.r2
-""" % (TestDiffFiles.diff_hdr % 'foo')
- self.__check_diff(p, exp, None)
-
- def testDiffModified(self):
- """diff a modified file"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.todo = ['nochange']
- exp = """%s
---- nochange\t(revision 2)
-+++ nochange\t(working copy)
-@@ -1,1 +1,2 @@
--This file didn't change.
-+This file didn't change but
-+is modified.
-""" % (TestDiffFiles.diff_hdr % 'nochange')
- self.__check_diff(p, exp, None)
-
- def testDiffUnversioned(self):
- """diff an unversioned file"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.todo = ['toadd2']
- self.assertRaises(osc.oscerr.OscIOError, self.__check_diff, p, '', None)
-
- def testDiffAddedMissing(self):
- """diff a file which has satus 'A' but the local file does not exist"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.todo = ['addedmissing']
- self.assertRaises(osc.oscerr.OscIOError, self.__check_diff, p, '', None)
-
- def testDiffMultipleFiles(self):
- """diff multiple files"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.todo = ['nochange', 'somefile']
- exp = """%s
---- nochange\t(revision 2)
-+++ nochange\t(working copy)
-@@ -1,1 +1,2 @@
--This file didn't change.
-+This file didn't change but
-+is modified.
-%s
---- somefile\t(revision 2)
-+++ somefile\t(working copy)
-@@ -1,1 +0,0 @@
--some content
-""" % (TestDiffFiles.diff_hdr % 'nochange', TestDiffFiles.diff_hdr % 'somefile')
- self.__check_diff(p, exp, None)
-
- def testDiffReplacedEmptyTodo(self):
- """diff a complete package"""
- self._change_to_pkg('replaced')
- p = osc.core.Package('.')
- exp = """%s
---- replaced\t(revision 2)
-+++ replaced\t(working copy)
-@@ -1,1 +1,1 @@
--yet another file
-+foo replaced
-""" % (TestDiffFiles.diff_hdr % 'replaced')
- self.__check_diff(p, exp, None)
-
- def testDiffBinaryAdded(self):
- """diff an added binary file"""
- self._change_to_pkg('binary')
- p = osc.core.Package('.')
- p.todo = ['binary_added']
- exp = """%s
-Binary file 'binary_added' added.
-""" % (TestDiffFiles.diff_hdr % 'binary_added')
- self.__check_diff(p, exp, None)
-
- def testDiffBinaryDeleted(self):
- """diff a deleted binary file"""
- self._change_to_pkg('binary')
- p = osc.core.Package('.')
- p.todo = ['binary_deleted']
- exp = """%s
-Binary file 'binary_deleted' deleted.
-""" % (TestDiffFiles.diff_hdr % 'binary_deleted')
- self.__check_diff(p, exp, None)
-
- def testDiffBinaryModified(self):
- """diff a modified binary file"""
- self._change_to_pkg('binary')
- p = osc.core.Package('.')
- p.todo = ['binary']
- exp = """%s
-Binary file 'binary' has changed.
-""" % (TestDiffFiles.diff_hdr % 'binary')
- self.__check_diff(p, exp, None)
-
- # diff with revision
- @GET('http://localhost/source/osctest/remote_simple_noadd?rev=3', file='testDiffRemoteNoChange_files')
- def testDiffRemoteNoChange(self):
- """diff against remote revision where no file changed"""
- self._change_to_pkg('remote_simple_noadd')
- p = osc.core.Package('.')
- self.__check_diff(p, '', 3)
-
- @GET('http://localhost/source/osctest/remote_simple?rev=3', file='testDiffRemoteModified_files')
- @GET('http://localhost/source/osctest/remote_simple/merge?rev=3', file='testDiffRemoteModified_merge')
- def testDiffRemoteModified(self):
- """diff against a remote revision with one modified file"""
- self._change_to_pkg('remote_simple')
- p = osc.core.Package('.')
- exp = """%s
---- merge\t(revision 3)
-+++ merge\t(working copy)
-@@ -1,3 +1,4 @@
- Is it
- possible to
- merge this file?
-+I hope so...
-%s
---- toadd1\t(revision 0)
-+++ toadd1\t(revision 0)
-@@ -0,0 +1,1 @@
-+toadd1
-""" % (TestDiffFiles.diff_hdr % 'merge', TestDiffFiles.diff_hdr % 'toadd1')
- self.__check_diff(p, exp, 3)
-
- @GET('http://localhost/source/osctest/remote_simple?rev=3', file='testDiffRemoteDeletedLocalAdded_files')
- def testDiffRemoteNotExistingLocalAdded(self):
- """
- a file which doesn't exist in a remote revision and
- has status A in the wc
- """
- self._change_to_pkg('remote_simple')
- p = osc.core.Package('.')
- exp = """%s
---- toadd1\t(revision 0)
-+++ toadd1\t(revision 0)
-@@ -0,0 +1,1 @@
-+toadd1
-""" % (TestDiffFiles.diff_hdr % 'toadd1')
- self.__check_diff(p, exp, 3)
-
- @GET('http://localhost/source/osctest/remote_simple_noadd?rev=3', file='testDiffRemoteExistingLocalNotExisting_files')
- @GET('http://localhost/source/osctest/remote_simple_noadd/foobar?rev=3', file='testDiffRemoteExistingLocalNotExisting_foobar')
- @GET('http://localhost/source/osctest/remote_simple_noadd/binary?rev=3', file='testDiffRemoteExistingLocalNotExisting_binary')
- def testDiffRemoteExistingLocalNotExisting(self):
- """
- a file doesn't exist in the local wc but exists
- in the remote revision
- """
- self._change_to_pkg('remote_simple_noadd')
- p = osc.core.Package('.')
- exp = """%s
---- foobar\t(revision 3)
-+++ foobar\t(working copy)
-@@ -1,2 +0,0 @@
--foobar
--barfoo
-%s
-Binary file 'binary' deleted.
-""" % (TestDiffFiles.diff_hdr % 'foobar', TestDiffFiles.diff_hdr % 'binary')
- self.__check_diff(p, exp, 3)
-
- @GET('http://localhost/source/osctest/remote_localmodified?rev=3', file='testDiffRemoteUnchangedLocalModified_files')
- @GET('http://localhost/source/osctest/remote_localmodified/nochange?rev=3', file='testDiffRemoteUnchangedLocalModified_nochange')
- @GET('http://localhost/source/osctest/remote_localmodified/binary?rev=3', file='testDiffRemoteUnchangedLocalModified_binary')
- def testDiffRemoteUnchangedLocalModified(self):
- """remote revision didn't change, local file is modified"""
- self._change_to_pkg('remote_localmodified')
- p = osc.core.Package('.')
- exp = """%s
---- nochange\t(revision 3)
-+++ nochange\t(working copy)
-@@ -1,1 +1,2 @@
- This file didn't change.
-+oh it does
-%s
-Binary file 'binary' has changed.
-""" % (TestDiffFiles.diff_hdr % 'nochange', TestDiffFiles.diff_hdr % 'binary')
- self.__check_diff(p, exp, 3)
-
- @GET('http://localhost/source/osctest/remote_simple_noadd?rev=3', file='testDiffRemoteMissingLocalExisting_files')
- def testDiffRemoteMissingLocalExisting(self):
- """
- remote revision misses a file which exists in the local wc (state ' ')"""
- self._change_to_pkg('remote_simple_noadd')
- p = osc.core.Package('.')
- exp = """%s
---- foo\t(revision 0)
-+++ foo\t(working copy)
-@@ -0,0 +1,1 @@
-+This is a simple test.
-""" % (TestDiffFiles.diff_hdr % 'foo')
- self.__check_diff(p, exp, 3)
-
- @GET('http://localhost/source/osctest/remote_localdelete?rev=3', file='testDiffRemoteMissingLocalDeleted_files')
- def testDiffRemoteMissingLocalDeleted(self):
- """
- remote revision misses a file which is marked for
- deletion in the local wc
- """
- # empty diff is expected (svn does the same)
- self._change_to_pkg('remote_localdelete')
- p = osc.core.Package('.')
- self.__check_diff(p, '', 3)
-
- def __check_diff(self, p, exp, revision=None):
- got = ''
- for i in p.get_diff(revision):
- got += ''.join(i)
-
- # When a hunk header refers to a single line in the "from"
- # file and/or the "to" file, e.g.
- #
- # @@ -37,37 +41,43 @@
- # @@ -37,39 +41,41 @@
- # @@ -37,37 +41,41 @@
- #
- # some systems will avoid repeating the line number:
- #
- # @@ -37 +41,43 @@
- # @@ -37,39 +41 @@
- # @@ -37 +41 @@
- #
- # so we need to canonise the output to avoid false negative
- # test failures.
-
- # TODO: Package.get_diff should return a consistent format
- # (regardless of the used python version)
- def __canonise_diff(diff):
- # we cannot use re.M because python 2.6's re.sub does
- # not support a flags argument
- diff = [re.sub('^@@ -(\d+) ', '@@ -\\1,\\1 ', line)
- for line in diff.split('\n')]
- diff = [re.sub('^(@@ -\d+,\d+) \+(\d+) ', '\\1 +\\2,\\2 ', line)
- for line in diff]
- return '\n'.join(diff)
-
- got = __canonise_diff(got)
- exp = __canonise_diff(exp)
- self.assertEqualMultiline(got, exp)
-
-if __name__ == '__main__':
- import unittest
- unittest.main()
+++ /dev/null
-import osc.core
-import osc.oscerr
-import os
-from common import OscTestCase
-FIXTURES_DIR = os.path.join(os.getcwd(), 'init_package_fixtures')
-
-def suite():
- import unittest
- return unittest.makeSuite(TestInitPackage)
-
-class TestInitPackage(OscTestCase):
- def _get_fixtures_dir(self):
- # workaround for git because it doesn't allow empty dirs
- if not os.path.exists(os.path.join(FIXTURES_DIR, 'osctest')):
- os.mkdir(os.path.join(FIXTURES_DIR, 'osctest'))
- return FIXTURES_DIR
-
- def tearDown(self):
- if os.path.exists(os.path.join(FIXTURES_DIR, 'osctest')):
- os.rmdir(os.path.join(FIXTURES_DIR, 'osctest'))
- OscTestCase.tearDown(self)
-
- def test_simple(self):
- """initialize a package dir"""
- pac_dir = os.path.join(self.tmpdir, 'testpkg')
- osc.core.Package.init_package('http://localhost', 'osctest', 'testpkg', pac_dir)
- storedir = os.path.join(pac_dir, osc.core.store)
- self.assertFalse(os.path.exists(os.path.join(storedir, '_meta_mode')))
- self.assertFalse(os.path.exists(os.path.join(storedir, '_size_limit')))
- self._check_list(os.path.join(storedir, '_project'), 'osctest\n')
- self._check_list(os.path.join(storedir, '_package'), 'testpkg\n')
- self._check_list(os.path.join(storedir, '_files'), '<directory />\n')
- self._check_list(os.path.join(storedir, '_apiurl'), 'http://localhost\n')
-
- def test_size_limit(self):
- """initialize a package dir with size_limit parameter"""
- pac_dir = os.path.join(self.tmpdir, 'testpkg')
- osc.core.Package.init_package('http://localhost', 'osctest', 'testpkg', pac_dir, size_limit=42)
- storedir = os.path.join(pac_dir, osc.core.store)
- self.assertFalse(os.path.exists(os.path.join(storedir, '_meta_mode')))
- self._check_list(os.path.join(storedir, '_size_limit'), '42\n')
- self._check_list(os.path.join(storedir, '_project'), 'osctest\n')
- self._check_list(os.path.join(storedir, '_package'), 'testpkg\n')
- self._check_list(os.path.join(storedir, '_files'), '<directory />\n')
- self._check_list(os.path.join(storedir, '_apiurl'), 'http://localhost\n')
-
- def test_meta_mode(self):
- """initialize a package dir with meta paramter"""
- pac_dir = os.path.join(self.tmpdir, 'testpkg')
- osc.core.Package.init_package('http://localhost', 'osctest', 'testpkg', pac_dir, meta=True)
- storedir = os.path.join(pac_dir, osc.core.store)
- self.assertFalse(os.path.exists(os.path.join(storedir, '_size_limit')))
- self._check_list(os.path.join(storedir, '_meta_mode'), '')
- self._check_list(os.path.join(storedir, '_project'), 'osctest\n')
- self._check_list(os.path.join(storedir, '_package'), 'testpkg\n')
- self._check_list(os.path.join(storedir, '_files'), '<directory />\n')
- self._check_list(os.path.join(storedir, '_apiurl'), 'http://localhost\n')
-
- def test_dirExists(self):
- """initialize a package dir (dir already exists)"""
- pac_dir = os.path.join(self.tmpdir, 'testpkg')
- os.mkdir(pac_dir)
- osc.core.Package.init_package('http://localhost', 'osctest', 'testpkg', pac_dir)
- storedir = os.path.join(pac_dir, osc.core.store)
- self.assertFalse(os.path.exists(os.path.join(storedir, '_meta_mode')))
- self.assertFalse(os.path.exists(os.path.join(storedir, '_size_limit')))
- self._check_list(os.path.join(storedir, '_project'), 'osctest\n')
- self._check_list(os.path.join(storedir, '_package'), 'testpkg\n')
- self._check_list(os.path.join(storedir, '_files'), '<directory />\n')
- self._check_list(os.path.join(storedir, '_apiurl'), 'http://localhost\n')
-
- def test_storedirExists(self):
- """initialize a package dir (dir+storedir already exists)"""
- pac_dir = os.path.join(self.tmpdir, 'testpkg')
- os.mkdir(pac_dir)
- os.mkdir(os.path.join(pac_dir, osc.core.store))
- self.assertRaises(osc.oscerr.OscIOError, osc.core.Package.init_package, 'http://localhost', 'osctest', 'testpkg', pac_dir)
-
- def test_dirIsFile(self):
- """initialize a package dir (dir is a file)"""
- pac_dir = os.path.join(self.tmpdir, 'testpkg')
- os.mkdir(pac_dir)
- open(os.path.join(pac_dir, osc.core.store), 'w').write('foo\n')
- self.assertRaises(osc.oscerr.OscIOError, osc.core.Package.init_package, 'http://localhost', 'osctest', 'testpkg', pac_dir)
-
-if __name__ == '__main__':
- import unittest
- unittest.main()
+++ /dev/null
-import osc.core
-import osc.oscerr
-import os
-from common import GET, OscTestCase
-FIXTURES_DIR = os.path.join(os.getcwd(), 'init_project_fixtures')
-
-def suite():
- import unittest
- return unittest.makeSuite(TestInitProject)
-
-class TestInitProject(OscTestCase):
- def _get_fixtures_dir(self):
- # workaround for git because it doesn't allow empty dirs
- if not os.path.exists(os.path.join(FIXTURES_DIR, 'osctest')):
- os.mkdir(os.path.join(FIXTURES_DIR, 'osctest'))
- return FIXTURES_DIR
-
- def tearDown(self):
- if os.path.exists(os.path.join(FIXTURES_DIR, 'osctest')):
- os.rmdir(os.path.join(FIXTURES_DIR, 'osctest'))
- OscTestCase.tearDown(self)
-
- def test_simple(self):
- """initialize a project dir"""
- prj_dir = os.path.join(self.tmpdir, 'testprj')
- prj = osc.core.Project.init_project('http://localhost', prj_dir, 'testprj', getPackageList=False)
- self.assertTrue(isinstance(prj, osc.core.Project))
- storedir = os.path.join(prj_dir, osc.core.store)
- self._check_list(os.path.join(storedir, '_project'), 'testprj\n')
- self._check_list(os.path.join(storedir, '_apiurl'), 'http://localhost\n')
- self._check_list(os.path.join(storedir, '_packages'), '<project name="testprj" />')
-
- def test_dirExists(self):
- """initialize a project dir but the dir already exists"""
- prj_dir = os.path.join(self.tmpdir, 'testprj')
- os.mkdir(prj_dir)
- prj = osc.core.Project.init_project('http://localhost', prj_dir, 'testprj', getPackageList=False)
- self.assertTrue(isinstance(prj, osc.core.Project))
- storedir = os.path.join(prj_dir, osc.core.store)
- self._check_list(os.path.join(storedir, '_project'), 'testprj\n')
- self._check_list(os.path.join(storedir, '_apiurl'), 'http://localhost\n')
- self._check_list(os.path.join(storedir, '_packages'), '<project name="testprj" />')
-
- def test_storedirExists(self):
- """initialize a project dir but the storedir already exists"""
- prj_dir = os.path.join(self.tmpdir, 'testprj')
- os.mkdir(prj_dir)
- os.mkdir(os.path.join(prj_dir, osc.core.store))
- self.assertRaises(osc.oscerr.OscIOError, osc.core.Project.init_project, 'http://localhost', prj_dir, 'testprj')
-
- @GET('http://localhost/source/testprj', text='<directory count="0" />')
- def test_no_package_tracking(self):
- """initialize a project dir but disable package tracking; enable getPackageList=True;
- disable wc_check (because we didn't disable the package tracking before the Project class
- was imported therefore REQ_STOREFILES contains '_packages')
- """
- import osc.conf
- # disable package tracking
- osc.conf.config['do_package_tracking'] = False
- prj_dir = os.path.join(self.tmpdir, 'testprj')
- os.mkdir(prj_dir)
- prj = osc.core.Project.init_project('http://localhost', prj_dir, 'testprj', False, wc_check=False)
- self.assertTrue(isinstance(prj, osc.core.Project))
- storedir = os.path.join(prj_dir, osc.core.store)
- self._check_list(os.path.join(storedir, '_project'), 'testprj\n')
- self._check_list(os.path.join(storedir, '_apiurl'), 'http://localhost\n')
- self.assertFalse(os.path.exists(os.path.join(storedir, '_packages')))
-
-if __name__ == '__main__':
- import unittest
- unittest.main()
+++ /dev/null
-import osc.core
-import osc.oscerr
-import os
-from common import OscTestCase
-
-FIXTURES_DIR = os.path.join(os.getcwd(), 'project_package_status_fixtures')
-
-def suite():
- import unittest
- return unittest.makeSuite(TestPackageStatus)
-
-class TestPackageStatus(OscTestCase):
- def _get_fixtures_dir(self):
- return FIXTURES_DIR
-
- def test_allfiles(self):
- """get the status of all files in the wc"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- exp_st = [('A', 'add'), ('?', 'exists'), ('D', 'foo'), ('!', 'merge'), ('R', 'missing'),
- ('!', 'missing_added'), ('M', 'nochange'), ('S', 'skipped'), (' ', 'test')]
- st = p.get_status()
- self.assertEqual(exp_st, st)
-
- def test_todo(self):
- """
- get the status of some files in the wc.
- """
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.todo = ['test', 'missing_added', 'foo']
- exp_st = [('D', 'foo'), ('!', 'missing_added')]
- st = p.get_status(False, ' ')
- self.assertEqual(exp_st, st)
-
- def test_todo_noexcl(self):
- """ get the status of some files in the wc. """
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.todo = ['test', 'missing_added', 'foo']
- exp_st = [('D', 'foo'), ('!', 'missing_added'), (' ', 'test')]
- st = p.get_status()
- self.assertEqual(exp_st, st)
-
- def test_exclude_state(self):
- """get the status of all files in the wc but exclude some states"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- exp_st = [('A', 'add'), ('?', 'exists'), ('D', 'foo')]
- st = p.get_status(False, '!', 'S', ' ', 'M', 'R')
- self.assertEqual(exp_st, st)
-
- def test_nonexistent(self):
- """get the status of a non existent file"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.todo = ['doesnotexist']
- self.assertRaises(osc.oscerr.OscIOError, p.get_status)
-
- def test_conflict(self):
- """get status of the wc (one file in conflict state)"""
- self._change_to_pkg('conflict')
- p = osc.core.Package('.')
- exp_st = [('C', 'conflict'), ('?', 'exists'), (' ', 'test')]
- st = p.get_status()
- self.assertEqual(exp_st, st)
-
- def test_excluded(self):
- """get status of the wc (ignore excluded files); package has state ' '"""
- self._change_to_pkg('excluded')
- p = osc.core.Package('.')
- exp_st = [('?', 'exists'), ('M', 'modified')]
- st = p.get_status(False, ' ')
- self.assertEqual(exp_st, st)
-
- def test_noexcluded(self):
- """get status of the wc (include excluded files)"""
- self._change_to_pkg('excluded')
- p = osc.core.Package('.')
- exp_st = [('?', '_linkerror'), ('?', 'exists'), ('?', 'foo.orig'), ('M', 'modified'), (' ', 'test')]
- st = p.get_status(True)
- self.assertEqual(exp_st, st)
-
-if __name__ == '__main__':
- import unittest
- unittest.main()
+++ /dev/null
-import osc.commandline
-import osc.core
-import osc.oscerr
-import os
-import re
-import sys
-import urllib2
-from common import GET, POST, OscTestCase, addExpectedRequest, EXPECTED_REQUESTS
-
-
-FIXTURES_DIR = os.path.join(os.getcwd(), 'prdiff_fixtures')
-API_URL = 'http://localhost/'
-UPSTREAM = 'some:project'
-BRANCH = 'home:user:branches:' + UPSTREAM
-
-def rdiff_url(pkg, oldprj, newprj):
- return API_URL + 'source/%s/%s?unified=1&opackage=%s&oproject=%s&cmd=diff&expand=1&filelimit=0' % \
- (newprj, pkg, pkg, oldprj.replace(':', '%3A'))
-
-def request_url(prj):
- return API_URL + 'search/request?match=%%28state%%2F%%40name%%3D%%27new%%27+or+state%%2F%%40name%%3D%%27review%%27%%29+and+%%28action%%2Ftarget%%2F%%40project%%3D%%27%s%%27+or+submit%%2Ftarget%%2F%%40project%%3D%%27%s%%27+or+action%%2Fsource%%2F%%40project%%3D%%27%s%%27+or+submit%%2Fsource%%2F%%40project%%3D%%27%s%%27%%29' % \
- tuple([prj.replace(':', '%3A')] * 4)
-
-def GET_PROJECT_PACKAGES(*projects):
- def decorator(test_method):
- def wrapped_test_method(*args):
- for project in projects:
- addExpectedRequest('GET', API_URL + 'source/' + project,
- file='%s/directory' % project)
- test_method(*args)
- # "rename" method otherwise we cannot specify a TestCaseClass.testName
- # cmdline arg when using unittest.main()
- wrapped_test_method.__name__ = test_method.__name__
- return wrapped_test_method
- return decorator
-
-def POST_RDIFF(oldprj, newprj):
- def decorator(test_method):
- def wrapped_test_method(*args):
- addExpectedRequest('POST', rdiff_url('common-one', oldprj, newprj), exp='', text='')
- addExpectedRequest('POST', rdiff_url('common-two', oldprj, newprj), exp='', file='common-two-diff')
- addExpectedRequest('POST', rdiff_url('common-three', oldprj, newprj), exp='', text='')
- test_method(*args)
- # "rename" method otherwise we cannot specify a TestCaseClass.testName
- # cmdline arg when using unittest.main()
- wrapped_test_method.__name__ = test_method.__name__
- return wrapped_test_method
- return decorator
-
-def suite():
- import unittest
- return unittest.makeSuite(TestProjectDiff)
-
-class TestProjectDiff(OscTestCase):
- diff_hdr = 'Index: %s\n==================================================================='
- def _get_fixtures_dir(self):
- return FIXTURES_DIR
-
- def _change_to_tmpdir(self, *args):
- os.chdir(os.path.join(self.tmpdir, *args))
-
- def _run_prdiff(self, *args):
- """Runs osc prdiff, returning captured STDOUT as a string."""
- cli = osc.commandline.Osc()
- argv = ['osc', '--no-keyring', '--no-gnome-keyring', 'prdiff']
- argv.extend(args)
- cli.main(argv=argv)
- return sys.stdout.getvalue()
-
-
- def testPrdiffTooManyArgs(self):
- def runner():
- self._run_prdiff('one', 'two', 'superfluous-arg')
- self.assertRaises(osc.oscerr.WrongArgs, runner)
-
-
- @GET_PROJECT_PACKAGES(UPSTREAM, BRANCH)
- @POST_RDIFF(UPSTREAM, BRANCH)
- @POST(rdiff_url('only-in-new', UPSTREAM, BRANCH), exp='', text='')
- def testPrdiffZeroArgs(self):
- exp = """identical: common-one
-differs: common-two
-identical: common-three
-identical: only-in-new
-"""
- def runner():
- self._run_prdiff()
-
- os.chdir('/tmp')
- self.assertRaises(osc.oscerr.WrongArgs, runner)
-
- self._change_to_tmpdir(FIXTURES_DIR, UPSTREAM)
- self.assertRaises(osc.oscerr.WrongArgs, runner)
-
- self._change_to_tmpdir(FIXTURES_DIR, BRANCH)
- out = self._run_prdiff()
- self.assertEqualMultiline(out, exp)
-
-
- @GET_PROJECT_PACKAGES(UPSTREAM, BRANCH)
- @POST_RDIFF(UPSTREAM, BRANCH)
- @POST(rdiff_url('only-in-new', UPSTREAM, BRANCH), exp='', text='')
- def testPrdiffOneArg(self):
- self._change_to_tmpdir()
- exp = """identical: common-one
-differs: common-two
-identical: common-three
-identical: only-in-new
-"""
- out = self._run_prdiff('home:user:branches:some:project')
- self.assertEqualMultiline(out, exp)
-
-
- @GET_PROJECT_PACKAGES('old:prj', 'new:prj')
- @POST_RDIFF('old:prj', 'new:prj')
- def testPrdiffTwoArgs(self):
- self._change_to_tmpdir()
- exp = """identical: common-one
-differs: common-two
-identical: common-three
-"""
- out = self._run_prdiff('old:prj', 'new:prj')
- self.assertEqualMultiline(out, exp)
-
-
- @GET_PROJECT_PACKAGES('old:prj', 'new:prj')
- @POST_RDIFF('old:prj', 'new:prj')
- def testPrdiffOldOnly(self):
- self._change_to_tmpdir()
- exp = """identical: common-one
-differs: common-two
-identical: common-three
-old only: only-in-old
-"""
- out = self._run_prdiff('--show-not-in-new', 'old:prj', 'new:prj')
- self.assertEqualMultiline(out, exp)
-
-
- @GET_PROJECT_PACKAGES('old:prj', 'new:prj')
- @POST_RDIFF('old:prj', 'new:prj')
- def testPrdiffNewOnly(self):
- self._change_to_tmpdir()
- exp = """identical: common-one
-differs: common-two
-identical: common-three
-new only: only-in-new
-"""
- out = self._run_prdiff('--show-not-in-old', 'old:prj', 'new:prj')
- self.assertEqualMultiline(out, exp)
-
-
- @GET_PROJECT_PACKAGES('old:prj', 'new:prj')
- @POST_RDIFF('old:prj', 'new:prj')
- def testPrdiffDiffstat(self):
- self._change_to_tmpdir()
- exp = """identical: common-one
-differs: common-two
-
- common-two | 1 +
- 1 file changed, 1 insertion(+)
-
-identical: common-three
-"""
- out = self._run_prdiff('--diffstat', 'old:prj', 'new:prj')
- self.assertEqualMultiline(out, exp)
-
-
- @GET_PROJECT_PACKAGES('old:prj', 'new:prj')
- @POST_RDIFF('old:prj', 'new:prj')
- def testPrdiffUnified(self):
- self._change_to_tmpdir()
- exp = """identical: common-one
-differs: common-two
-
-Index: common-two
-===================================================================
---- common-two\t2013-01-18 19:18:38.225983117 +0000
-+++ common-two\t2013-01-18 19:19:27.882082325 +0000
-@@ -1,4 +1,5 @@
- line one
- line two
- line three
-+an extra line
- last line
-
-identical: common-three
-"""
- out = self._run_prdiff('--unified', 'old:prj', 'new:prj')
- self.assertEqualMultiline(out, exp)
-
-
- @GET_PROJECT_PACKAGES('old:prj', 'new:prj')
- @POST(rdiff_url('common-two', 'old:prj', 'new:prj'), exp='', file='common-two-diff')
- @POST(rdiff_url('common-three', 'old:prj', 'new:prj'), exp='', text='')
- def testPrdiffInclude(self):
- self._change_to_tmpdir()
- exp = """differs: common-two
-identical: common-three
-"""
- out = self._run_prdiff('--include', 'common-t',
- 'old:prj', 'new:prj')
- self.assertEqualMultiline(out, exp)
-
-
- @GET_PROJECT_PACKAGES('old:prj', 'new:prj')
- @POST(rdiff_url('common-two', 'old:prj', 'new:prj'), exp='', file='common-two-diff')
- @POST(rdiff_url('common-three', 'old:prj', 'new:prj'), exp='', text='')
- def testPrdiffExclude(self):
- self._change_to_tmpdir()
- exp = """differs: common-two
-identical: common-three
-"""
- out = self._run_prdiff('--exclude', 'one', 'old:prj', 'new:prj')
- self.assertEqualMultiline(out, exp)
-
-
- @GET_PROJECT_PACKAGES('old:prj', 'new:prj')
- @POST(rdiff_url('common-two', 'old:prj', 'new:prj'), exp='', file='common-two-diff')
- def testPrdiffIncludeExclude(self):
- self._change_to_tmpdir()
- exp = """differs: common-two
-"""
- out = self._run_prdiff('--include', 'common-t',
- '--exclude', 'three',
- 'old:prj', 'new:prj')
- self.assertEqualMultiline(out, exp)
-
-
- @GET_PROJECT_PACKAGES(UPSTREAM, BRANCH)
- @GET(request_url(UPSTREAM), exp='', file='request')
- @POST(rdiff_url('common-one', UPSTREAM, BRANCH), exp='', text='')
- @POST(rdiff_url('common-two', UPSTREAM, BRANCH), exp='', file='common-two-diff')
- @POST(rdiff_url('common-three', UPSTREAM, BRANCH), exp='', file='common-two-diff')
- @POST(rdiff_url('only-in-new', UPSTREAM, BRANCH), exp='', text='')
- def testPrdiffRequestsMatching(self):
- self._change_to_tmpdir()
- exp = """identical: common-one
-differs: common-two
-
-148023 State:new By:user When:2013-01-11T11:04:14
- submit: home:user:branches:some:project/common-two -> some:project
- Descr: - Fix it to work - Improve support for something
-
-differs: common-three
-identical: only-in-new
-"""
- out = self._run_prdiff('--requests', UPSTREAM, BRANCH)
- self.assertEqualMultiline(out, exp)
-
-
- # Reverse the direction of the diff.
- @GET_PROJECT_PACKAGES(BRANCH, UPSTREAM)
- @GET(request_url(BRANCH), exp='', file='no-requests')
- @POST(rdiff_url('common-one', BRANCH, UPSTREAM), exp='', text='')
- @POST(rdiff_url('common-two', BRANCH, UPSTREAM), exp='', file='common-two-diff')
- @POST(rdiff_url('common-three', BRANCH, UPSTREAM), exp='', file='common-two-diff')
- @POST(rdiff_url('only-in-new', BRANCH, UPSTREAM), exp='', text='')
- def testPrdiffRequestsSwitched(self):
- self._change_to_tmpdir()
- exp = """identical: common-one
-differs: common-two
-differs: common-three
-identical: only-in-new
-"""
- out = self._run_prdiff('--requests', BRANCH, UPSTREAM)
- self.assertEqualMultiline(out, exp)
-
-
-
-if __name__ == '__main__':
- import unittest
- unittest.main()
+++ /dev/null
-import osc.core
-import osc.oscerr
-import os
-from common import OscTestCase
-
-FIXTURES_DIR = os.path.join(os.getcwd(), 'project_package_status_fixtures')
-
-def suite():
- import unittest
- return unittest.makeSuite(TestProjectStatus)
-
-class TestProjectStatus(OscTestCase):
- def _get_fixtures_dir(self):
- return FIXTURES_DIR
-
- def test_simple(self):
- """get the status of a package with state ' '"""
- self._change_to_pkg('.')
- prj = osc.core.Project('.', getPackageList=False)
- exp_st = ' '
- st = prj.status('simple')
- self.assertEqual(exp_st, st)
-
- def test_added(self):
- """get the status of an added package"""
- self._change_to_pkg('.')
- prj = osc.core.Project('.', getPackageList=False)
- exp_st = 'A'
- st = prj.status('added')
- self.assertEqual(exp_st, st)
-
- def test_deleted(self):
- """get the status of a deleted package"""
- self._change_to_pkg('.')
- prj = osc.core.Project('.', getPackageList=False)
- exp_st = 'D'
- st = prj.status('deleted')
- self.assertEqual(exp_st, st)
-
- def test_added_deleted(self):
- """
- get the status of a package which was added and deleted
- afterwards (with a non osc command)
- """
- self._change_to_pkg('.')
- prj = osc.core.Project('.', getPackageList=False)
- exp_st = '!'
- st = prj.status('added_deleted')
- self.assertEqual(exp_st, st)
-
- def test_missing(self):
- """
- get the status of a package with state " "
- which was removed by a non osc command
- """
- self._change_to_pkg('.')
- prj = osc.core.Project('.', getPackageList=False)
- exp_st = '!'
- st = prj.status('missing')
- self.assertEqual(exp_st, st)
-
- def test_deleted_deleted(self):
- """
- get the status of a package which was deleted (with an
- osc command) and afterwards the package directory was
- deleted with a non osc command
- """
- self._change_to_pkg('.')
- prj = osc.core.Project('.', getPackageList=False)
- exp_st = 'D'
- st = prj.status('deleted_deleted')
- self.assertEqual(exp_st, st)
-
- def test_unversioned_exists(self):
- """get the status of an unversioned package"""
- self._change_to_pkg('.')
- prj = osc.core.Project('.', getPackageList=False)
- exp_st = '?'
- st = prj.status('excluded')
- self.assertEqual(exp_st, st)
-
- def test_unversioned_nonexistent(self):
- """get the status of an unversioned, nonexistent package"""
- self._change_to_pkg('.')
- prj = osc.core.Project('.', getPackageList=False)
- self.assertRaises(osc.oscerr.OscIOError, prj.status, 'doesnotexist')
-
- def test_get_status(self):
- """get the status of the complete project"""
- self._change_to_pkg('.')
- prj = osc.core.Project('.', getPackageList=False)
- exp_st = [(' ', 'conflict'), (' ', 'simple'), ('A', 'added'), ('D', 'deleted'),
- ('!', 'missing'), ('!', 'added_deleted'), ('D', 'deleted_deleted'), ('?', 'excluded')]
- st = prj.get_status()
- self.assertEqual(exp_st, st)
-
- def test_get_status_excl(self):
- """get the status of the complete project (exclude some states)"""
- self._change_to_pkg('.')
- prj = osc.core.Project('.', getPackageList=False)
- exp_st = [('A', 'added'), ('!', 'missing'), ('!', 'added_deleted')]
- st = prj.get_status('D', ' ', '?')
- self.assertEqual(exp_st, st)
-
- def test_get_pacobj_simple(self):
- """package exists"""
- self._change_to_pkg('.')
- prj = osc.core.Project('.', getPackageList=False)
- p = prj.get_pacobj('simple')
- self.assertTrue(isinstance(p, osc.core.Package))
- self.assertEqual(p.name, 'simple')
-
- def test_get_pacobj_added(self):
- """package has state 'A', also test pac_kwargs"""
- self._change_to_pkg('.')
- prj = osc.core.Project('.', getPackageList=False)
- p = prj.get_pacobj('added', progress_obj={})
- self.assertTrue(isinstance(p, osc.core.Package))
- self.assertEqual(p.name, 'added')
- self.assertEqual(p.progress_obj, {})
-
- def test_get_pacobj_deleted(self):
- """package has state 'D' and exists, also test pac_args"""
- self._change_to_pkg('.')
- prj = osc.core.Project('.', getPackageList=False)
- p = prj.get_pacobj('deleted', {})
- self.assertTrue(isinstance(p, osc.core.Package))
- self.assertEqual(p.name, 'deleted')
- self.assertEqual(p.progress_obj, {})
-
- def test_get_pacobj_missing(self):
- """package is missing"""
- self._change_to_pkg('.')
- prj = osc.core.Project('.', getPackageList=False)
- p = prj.get_pacobj('missing')
- self.assertTrue(isinstance(p, type(None)))
-
- def test_get_pacobj_deleted_deleted(self):
- """package has state 'D' and does not exist"""
- self._change_to_pkg('.')
- prj = osc.core.Project('.', getPackageList=False)
- p = prj.get_pacobj('deleted_deleted')
- self.assertTrue(isinstance(p, type(None)))
-
- def test_get_pacobj_unversioned(self):
- """package/dir has state '?'"""
- self._change_to_pkg('.')
- prj = osc.core.Project('.', getPackageList=False)
- p = prj.get_pacobj('excluded')
- self.assertTrue(isinstance(p, type(None)))
-
- def test_get_pacobj_nonexistent(self):
- """package/dir does not exist"""
- self._change_to_pkg('.')
- prj = osc.core.Project('.', getPackageList=False)
- p = prj.get_pacobj('doesnotexist')
- self.assertTrue(isinstance(p, type(None)))
-
-if __name__ == '__main__':
- import unittest
- unittest.main()
+++ /dev/null
-import osc.core
-import osc.oscerr
-import os
-import sys
-from common import GET, PUT, POST, DELETE, OscTestCase
-from xml.etree import cElementTree as ET
-FIXTURES_DIR = os.path.join(os.getcwd(), 'repairwc_fixtures')
-
-def suite():
- import unittest
- return unittest.makeSuite(TestRepairWC)
-
-class TestRepairWC(OscTestCase):
- def _get_fixtures_dir(self):
- return FIXTURES_DIR
-
- def __assertNotRaises(self, exception, meth, *args, **kwargs):
- try:
- meth(*args, **kwargs)
- except exception:
- self.fail('%s raised' % exception.__name__)
-
- def test_working_empty(self):
- """consistent, empty working copy"""
- self._change_to_pkg('working_empty')
- self.__assertNotRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.')
-
- def test_working_nonempty(self):
- """
- consistent, non-empty working copy. One file is in conflict,
- one file is marked for deletion and one file has state 'A'
- """
- self._change_to_pkg('working_nonempty')
- self.__assertNotRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.')
-
- def test_buildfiles(self):
- """
- wc has a _buildconfig_prj_arch and a _buildinfo_prj_arch.xml in the storedir
- """
- self._change_to_pkg('buildfiles')
- self.__assertNotRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.')
-
- @GET('http://localhost/source/osctest/simple1/foo?rev=1', text='This is a simple test.\n')
- def test_simple1(self):
- """a file is marked for deletion but storefile doesn't exist"""
- self._change_to_pkg('simple1')
- self.assertRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.')
- p = osc.core.Package('.', wc_check=False)
- p.wc_repair()
- self.assertTrue(os.path.exists(os.path.join('.osc', 'foo')))
- self._check_deletelist('foo\n')
- self._check_status(p, 'foo', 'D')
- self._check_status(p, 'nochange', 'M')
- self._check_status(p, 'merge', ' ')
- self._check_status(p, 'toadd1', '?')
- # additional cleanup check
- self.__assertNotRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.')
-
- def test_simple2(self):
- """a file "somefile" exists in the storedir which isn't tracked"""
- self._change_to_pkg('simple2')
- self.assertRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.')
- p = osc.core.Package('.', wc_check=False)
- p.wc_repair()
- self.assertFalse(os.path.exists(os.path.join('.osc', 'somefile')))
- self._check_deletelist('foo\n')
- self._check_status(p, 'foo', 'D')
- self._check_status(p, 'nochange', 'M')
- self._check_status(p, 'merge', ' ')
- self._check_status(p, 'toadd1', '?')
- # additional cleanup check
- self.__assertNotRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.')
-
- def test_simple3(self):
- """toadd1 has state 'A' and a file .osc/toadd1 exists"""
- self._change_to_pkg('simple3')
- self.assertRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.')
- p = osc.core.Package('.', wc_check=False)
- p.wc_repair()
- self.assertFalse(os.path.exists(os.path.join('.osc', 'toadd1')))
- self._check_deletelist('foo\n')
- self._check_status(p, 'foo', 'D')
- self._check_status(p, 'nochange', 'M')
- self._check_status(p, 'merge', ' ')
- self._check_addlist('toadd1\n')
- self._check_status(p, 'toadd1', 'A')
- # additional cleanup check
- self.__assertNotRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.')
-
- def test_simple4(self):
- """a file is listed in _to_be_deleted but isn't present in _files"""
- self._change_to_pkg('simple4')
- self.assertRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.')
- p = osc.core.Package('.', wc_check=False)
- p.wc_repair()
- self._check_deletelist('foo\n')
- self._check_status(p, 'foo', 'D')
- self._check_status(p, 'nochange', 'M')
- self._check_status(p, 'merge', ' ')
- self._check_status(p, 'toadd1', '?')
- # additional cleanup check
- self.__assertNotRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.')
-
- def test_simple5(self):
- """a file is listed in _in_conflict but isn't present in _files"""
- self._change_to_pkg('simple5')
- self.assertRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.')
- p = osc.core.Package('.', wc_check=False)
- p.wc_repair()
- self.assertFalse(os.path.exists(os.path.join('.osc', '_in_conflict')))
- self._check_deletelist('foo\n')
- self._check_status(p, 'foo', 'D')
- self._check_status(p, 'nochange', 'M')
- self._check_status(p, 'merge', ' ')
- self._check_status(p, 'toadd1', '?')
- # additional cleanup check
- self.__assertNotRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.')
-
- @GET('http://localhost/source/osctest/simple6/foo?rev=1', text='This is a simple test.\n')
- def test_simple6(self):
- """
- a file is listed in _to_be_deleted and is present
- in _files but the storefile is missing
- """
- self._change_to_pkg('simple6')
- self.assertRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.')
- p = osc.core.Package('.', wc_check=False)
- p.wc_repair()
- self.assertTrue(os.path.exists(os.path.join('.osc', 'foo')))
- self._check_deletelist('foo\n')
- self._check_status(p, 'foo', 'D')
- self._check_status(p, 'nochange', 'M')
- self._check_status(p, 'merge', ' ')
- self._check_status(p, 'toadd1', '?')
- # additional cleanup check
- self.__assertNotRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.')
-
- def test_simple7(self):
- """files marked as skipped don't exist in the storedir"""
- self._change_to_pkg('simple7')
- self.__assertNotRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.')
-
- def test_simple8(self):
- """
- a file is marked as skipped but the skipped file exists in the storedir
- """
- self._change_to_pkg('simple8')
- self.assertRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.')
- p = osc.core.Package('.', wc_check=False)
- p.wc_repair()
- self.assertFalse(os.path.exists(os.path.join('.osc', 'skipped')))
- self._check_deletelist('foo\n')
- self._check_status(p, 'foo', 'D')
- self._check_status(p, 'nochange', 'M')
- self._check_status(p, 'merge', ' ')
- self._check_status(p, 'toadd1', '?')
- self._check_status(p, 'skipped', 'S')
- # additional cleanup check
- self.__assertNotRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.')
-
- @GET('http://localhost/source/osctest/multiple/merge?rev=1', text='Is it\npossible to\nmerge this file?I hope so...\n')
- @GET('http://localhost/source/osctest/multiple/nochange?rev=1', text='This file didn\'t change.\n')
- def test_multiple(self):
- """
- a storefile is missing, a file is listed in _to_be_deleted
- but is not present in _files, a file is listed in _in_conflict
- but the storefile is missing and a file exists in the storedir
- but is not present in _files
- """
- self._change_to_pkg('multiple')
- self.assertRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.')
- p = osc.core.Package('.', wc_check=False)
- p.wc_repair()
- self.assertTrue(os.path.exists(os.path.join('.osc', 'foo')))
- self.assertFalse(os.path.exists(os.path.join('.osc', 'unknown_file')))
- self._check_deletelist('foo\n')
- self._check_status(p, 'foo', 'D')
- self._check_status(p, 'nochange', 'C')
- self._check_status(p, 'merge', ' ')
- self._check_status(p, 'foobar', 'A')
- self._check_status(p, 'toadd1', '?')
- # additional cleanup check
- self.__assertNotRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.')
-
- def test_noapiurl(self):
- """the package wc has no _apiurl file"""
- self._change_to_pkg('noapiurl')
- p = osc.core.Package('.', wc_check=False)
- p.wc_repair('http://localhost')
- self.assertTrue(os.path.exists(os.path.join('.osc', '_apiurl')))
- self.assertEqual(open(os.path.join('.osc', '_apiurl')).read(), 'http://localhost\n')
- self.assertEqual(p.apiurl, 'http://localhost')
-
- def test_invalidapiurl(self):
- """the package wc has an invalid apiurl file (invalid url format)"""
- self._change_to_pkg('invalid_apiurl')
- p = osc.core.Package('.', wc_check=False)
- p.wc_repair('http://localhost')
- self.assertTrue(os.path.exists(os.path.join('.osc', '_apiurl')))
- self.assertEqual(open(os.path.join('.osc', '_apiurl')).read(), 'http://localhost\n')
- self.assertEqual(p.apiurl, 'http://localhost')
-
- def test_invalidapiurl_param(self):
- """pass an invalid apiurl to wc_repair"""
- import urllib2
- self._change_to_pkg('invalid_apiurl')
- p = osc.core.Package('.', wc_check=False)
- self.assertRaises(urllib2.URLError, p.wc_repair, 'http:/localhost')
- self.assertRaises(urllib2.URLError, p.wc_repair, 'invalid')
-
- def test_noapiurlNotExistingApiurl(self):
- """the package wc has no _apiurl file and no apiurl is passed to repairwc"""
- self._change_to_pkg('noapiurl')
- self.assertRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.')
- p = osc.core.Package('.', wc_check=False)
- self.assertRaises(osc.oscerr.WorkingCopyInconsistent, p.wc_repair)
- self.assertFalse(os.path.exists(os.path.join('.osc', '_apiurl')))
-
- def test_project_noapiurl(self):
- """the project wc has no _apiurl file"""
- import shutil
- prj_dir = os.path.join(self.tmpdir, 'prj_noapiurl')
- shutil.copytree(os.path.join(self._get_fixtures_dir(), 'prj_noapiurl'), prj_dir)
- storedir = os.path.join(prj_dir, osc.core.store)
- self.assertRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Project, prj_dir, getPackageList=False)
- prj = osc.core.Project(prj_dir, wc_check=False, getPackageList=False)
- prj.wc_repair('http://localhost')
- self.assertTrue(os.path.exists(os.path.join(storedir, '_apiurl')))
- self.assertTrue(os.path.exists(os.path.join(storedir, '_apiurl')))
- self.assertEqual(open(os.path.join(storedir, '_apiurl'), 'r').read(), 'http://localhost\n')
-
- def test_project_invalidapiurl(self):
- """the project wc has an invalid _apiurl file (invalid url format)"""
- import shutil
- prj_dir = os.path.join(self.tmpdir, 'prj_invalidapiurl')
- shutil.copytree(os.path.join(self._get_fixtures_dir(), 'prj_invalidapiurl'), prj_dir)
- storedir = os.path.join(prj_dir, osc.core.store)
- self.assertRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Project, prj_dir, getPackageList=False)
- prj = osc.core.Project(prj_dir, wc_check=False, getPackageList=False)
- prj.wc_repair('http://localhost')
- self.assertTrue(os.path.exists(os.path.join(storedir, '_apiurl')))
- self.assertTrue(os.path.exists(os.path.join(storedir, '_apiurl')))
- self.assertEqual(open(os.path.join(storedir, '_apiurl'), 'r').read(), 'http://localhost\n')
-
- def test_project_invalidapiurl_param(self):
- """pass an invalid apiurl to wc_repair"""
- import shutil
- import urllib2
- prj_dir = os.path.join(self.tmpdir, 'prj_invalidapiurl')
- shutil.copytree(os.path.join(self._get_fixtures_dir(), 'prj_invalidapiurl'), prj_dir)
- storedir = os.path.join(prj_dir, osc.core.store)
- self.assertRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Project, prj_dir, getPackageList=False)
- prj = osc.core.Project(prj_dir, wc_check=False, getPackageList=False)
- self.assertRaises(urllib2.URLError, prj.wc_repair, 'http:/localhost')
- self.assertRaises(urllib2.URLError, prj.wc_repair, 'invalid')
-
-if __name__ == '__main__':
- import unittest
- unittest.main()
+++ /dev/null
-import osc.core
-import osc.oscerr
-import os
-from common import OscTestCase
-
-FIXTURES_DIR = os.path.join(os.getcwd(), 'request_fixtures')
-
-def suite():
- import unittest
- return unittest.makeSuite(TestRequest)
-
-class TestRequest(OscTestCase):
- def _get_fixtures_dir(self):
- return FIXTURES_DIR
-
- def setUp(self):
- OscTestCase.setUp(self, copytree=False)
-
- def test_createsr(self):
- """create a simple submitrequest"""
- r = osc.core.Request()
- r.add_action('submit', src_project='foo', src_package='bar', src_rev='42',
- tgt_project='foobar', tgt_package='bar')
- self.assertEqual(r.actions[0].type, 'submit')
- self.assertEqual(r.actions[0].src_project, 'foo')
- self.assertEqual(r.actions[0].src_package, 'bar')
- self.assertEqual(r.actions[0].src_rev, '42')
- self.assertEqual(r.actions[0].tgt_project, 'foobar')
- self.assertEqual(r.actions[0].tgt_package, 'bar')
- self.assertTrue(r.actions[0].opt_sourceupdate is None)
- self.assertTrue(r.actions[0].opt_updatelink is None)
- self.assertTrue(len(r.statehistory) == 0)
- self.assertTrue(len(r.reviews) == 0)
- self.assertRaises(AttributeError, getattr, r.actions[0], 'doesnotexist')
- exp = """<request>
- <action type="submit">
- <source package="bar" project="foo" rev="42" />
- <target package="bar" project="foobar" />
- </action>
-</request>"""
- self.assertEqual(exp, r.to_str())
-
- def test_createsr_with_option(self):
- """create a submitrequest with option"""
- """create a simple submitrequest"""
- r = osc.core.Request()
- r.add_action('submit', src_project='foo', src_package='bar',
- tgt_project='foobar', tgt_package='bar', opt_sourceupdate='cleanup', opt_updatelink='1')
- self.assertEqual(r.actions[0].type, 'submit')
- self.assertEqual(r.actions[0].src_project, 'foo')
- self.assertEqual(r.actions[0].src_package, 'bar')
- self.assertEqual(r.actions[0].tgt_project, 'foobar')
- self.assertEqual(r.actions[0].tgt_package, 'bar')
- self.assertEqual(r.actions[0].opt_sourceupdate, 'cleanup')
- self.assertEqual(r.actions[0].opt_updatelink, '1')
- self.assertTrue(r.actions[0].src_rev is None)
- self.assertTrue(len(r.statehistory) == 0)
- self.assertTrue(len(r.reviews) == 0)
- self.assertRaises(AttributeError, getattr, r.actions[0], 'doesnotexist')
- exp = """<request>
- <action type="submit">
- <source package="bar" project="foo" />
- <target package="bar" project="foobar" />
- <options>
- <sourceupdate>cleanup</sourceupdate>
- <updatelink>1</updatelink>
- </options>
- </action>
-</request>"""
- self.assertEqual(exp, r.to_str())
-
- def test_createsr_missing_tgt_package(self):
- """create a submitrequest with missing target package"""
- r = osc.core.Request()
- r.add_action('submit', src_project='foo', src_package='bar',
- tgt_project='foobar')
- self.assertEqual(r.actions[0].type, 'submit')
- self.assertEqual(r.actions[0].src_project, 'foo')
- self.assertEqual(r.actions[0].src_package, 'bar')
- self.assertEqual(r.actions[0].tgt_project, 'foobar')
- self.assertTrue(len(r.statehistory) == 0)
- self.assertTrue(len(r.reviews) == 0)
- self.assertTrue(r.actions[0].tgt_package is None)
- self.assertRaises(AttributeError, getattr, r.actions[0], 'doesnotexist')
- exp = """<request>
- <action type="submit">
- <source package="bar" project="foo" />
- <target project="foobar" />
- </action>
-</request>"""
- self.assertEqual(exp, r.to_str())
-
- def test_createsr_invalid_argument(self):
- """create a submitrequest with invalid action argument"""
- r = osc.core.Request()
- self.assertRaises(osc.oscerr.WrongArgs, r.add_action, 'submit', src_project='foo', src_invalid='bar')
-
- def test_create_request_invalid_type(self):
- """create a request with an invalid action type"""
- r = osc.core.Request()
- self.assertRaises(osc.oscerr.WrongArgs, r.add_action, 'invalid', foo='bar')
-
- def test_create_add_role_person(self):
- """create an add_role request (person element)"""
- r = osc.core.Request()
- r.add_action('add_role', tgt_project='foo', tgt_package='bar', person_name='user', person_role='reader')
- self.assertEqual(r.actions[0].type, 'add_role')
- self.assertEqual(r.actions[0].tgt_project, 'foo')
- self.assertEqual(r.actions[0].tgt_package, 'bar')
- self.assertEqual(r.actions[0].person_name, 'user')
- self.assertEqual(r.actions[0].person_role, 'reader')
- self.assertTrue(r.actions[0].group_name is None)
- self.assertTrue(r.actions[0].group_role is None)
- exp = """<request>
- <action type="add_role">
- <target package="bar" project="foo" />
- <person name="user" role="reader" />
- </action>
-</request>"""
- self.assertEqual(exp, r.to_str())
-
- def test_create_add_role_group(self):
- """create an add_role request (group element)"""
- r = osc.core.Request()
- r.add_action('add_role', tgt_project='foo', tgt_package='bar', group_name='group', group_role='reviewer')
- self.assertEqual(r.actions[0].type, 'add_role')
- self.assertEqual(r.actions[0].tgt_project, 'foo')
- self.assertEqual(r.actions[0].tgt_package, 'bar')
- self.assertEqual(r.actions[0].group_name, 'group')
- self.assertEqual(r.actions[0].group_role, 'reviewer')
- self.assertTrue(r.actions[0].person_name is None)
- self.assertTrue(r.actions[0].person_role is None)
- self.assertTrue(len(r.statehistory) == 0)
- self.assertTrue(len(r.reviews) == 0)
- exp = """<request>
- <action type="add_role">
- <target package="bar" project="foo" />
- <group name="group" role="reviewer" />
- </action>
-</request>"""
- self.assertEqual(exp, r.to_str())
-
- def test_create_add_role_person_group(self):
- """create an add_role request (person+group element)"""
- r = osc.core.Request()
- r.add_action('add_role', tgt_project='foo', tgt_package='bar', person_name='user', person_role='reader',
- group_name='group', group_role='reviewer')
- self.assertEqual(r.actions[0].type, 'add_role')
- self.assertEqual(r.actions[0].tgt_project, 'foo')
- self.assertEqual(r.actions[0].tgt_package, 'bar')
- self.assertEqual(r.actions[0].person_name, 'user')
- self.assertEqual(r.actions[0].person_role, 'reader')
- self.assertEqual(r.actions[0].group_name, 'group')
- self.assertEqual(r.actions[0].group_role, 'reviewer')
- self.assertTrue(len(r.statehistory) == 0)
- self.assertTrue(len(r.reviews) == 0)
- exp = """<request>
- <action type="add_role">
- <target package="bar" project="foo" />
- <person name="user" role="reader" />
- <group name="group" role="reviewer" />
- </action>
-</request>"""
- self.assertEqual(exp, r.to_str())
-
- def test_create_set_bugowner_project(self):
- """create a set_bugowner request for a project"""
- r = osc.core.Request()
- r.add_action('set_bugowner', tgt_project='foobar', person_name='buguser')
- self.assertEqual(r.actions[0].type, 'set_bugowner')
- self.assertEqual(r.actions[0].tgt_project, 'foobar')
- self.assertEqual(r.actions[0].person_name, 'buguser')
- self.assertTrue(r.actions[0].tgt_package is None)
- self.assertTrue(len(r.statehistory) == 0)
- self.assertTrue(len(r.reviews) == 0)
- exp = """<request>
- <action type="set_bugowner">
- <target project="foobar" />
- <person name="buguser" />
- </action>
-</request>"""
- self.assertEqual(exp, r.to_str())
-
- def test_create_set_bugowner_package(self):
- """create a set_bugowner request for a package"""
- r = osc.core.Request()
- r.add_action('set_bugowner', tgt_project='foobar', tgt_package='baz', person_name='buguser')
- self.assertEqual(r.actions[0].type, 'set_bugowner')
- self.assertEqual(r.actions[0].tgt_project, 'foobar')
- self.assertEqual(r.actions[0].tgt_package, 'baz')
- self.assertEqual(r.actions[0].person_name, 'buguser')
- self.assertTrue(len(r.statehistory) == 0)
- self.assertTrue(len(r.reviews) == 0)
- exp = """<request>
- <action type="set_bugowner">
- <target package="baz" project="foobar" />
- <person name="buguser" />
- </action>
-</request>"""
- self.assertEqual(exp, r.to_str())
-
- def test_create_delete_project(self):
- """create a delete request for a project"""
- r = osc.core.Request()
- r.add_action('delete', tgt_project='foo')
- self.assertEqual(r.actions[0].type, 'delete')
- self.assertEqual(r.actions[0].tgt_project, 'foo')
- self.assertTrue(r.actions[0].tgt_package is None)
- self.assertTrue(len(r.statehistory) == 0)
- self.assertTrue(len(r.reviews) == 0)
- exp = """<request>
- <action type="delete">
- <target project="foo" />
- </action>
-</request>"""
- self.assertEqual(exp, r.to_str())
-
- def test_create_delete_package(self):
- """create a delete request for a package"""
- r = osc.core.Request()
- r.add_action('delete', tgt_project='foo', tgt_package='deleteme')
- self.assertEqual(r.actions[0].type, 'delete')
- self.assertEqual(r.actions[0].tgt_project, 'foo')
- self.assertEqual(r.actions[0].tgt_package, 'deleteme')
- self.assertTrue(len(r.statehistory) == 0)
- self.assertTrue(len(r.reviews) == 0)
- exp = """<request>
- <action type="delete">
- <target package="deleteme" project="foo" />
- </action>
-</request>"""
- self.assertEqual(exp, r.to_str())
-
- def test_create_change_devel(self):
- """create a change devel request"""
- r = osc.core.Request()
- r.add_action('change_devel', src_project='foo', src_package='bar', tgt_project='devprj', tgt_package='devpkg')
- self.assertEqual(r.actions[0].type, 'change_devel')
- self.assertEqual(r.actions[0].src_project, 'foo')
- self.assertEqual(r.actions[0].src_package, 'bar')
- self.assertEqual(r.actions[0].tgt_project, 'devprj')
- self.assertEqual(r.actions[0].tgt_package, 'devpkg')
- self.assertTrue(len(r.statehistory) == 0)
- self.assertTrue(len(r.reviews) == 0)
- exp = """<request>
- <action type="change_devel">
- <source package="bar" project="foo" />
- <target package="devpkg" project="devprj" />
- </action>
-</request>"""
- self.assertEqual(exp, r.to_str())
-
- def test_action_from_xml1(self):
- """create action from xml"""
- from xml.etree import cElementTree as ET
- xml = """<action type="add_role">
- <target package="bar" project="foo" />
- <person name="user" role="reader" />
- <group name="group" role="reviewer" />
-</action>"""
- action = osc.core.Action.from_xml(ET.fromstring(xml))
- self.assertEqual(action.type, 'add_role')
- self.assertEqual(action.tgt_project, 'foo')
- self.assertEqual(action.tgt_package, 'bar')
- self.assertEqual(action.person_name, 'user')
- self.assertEqual(action.person_role, 'reader')
- self.assertEqual(action.group_name, 'group')
- self.assertEqual(action.group_role, 'reviewer')
- self.assertEqual(xml, action.to_str())
-
- def test_action_from_xml2(self):
- """create action from xml"""
- from xml.etree import cElementTree as ET
- xml = """<action type="submit">
- <source package="bar" project="foo" />
- <target package="bar" project="foobar" />
- <options>
- <sourceupdate>cleanup</sourceupdate>
- <updatelink>1</updatelink>
- </options>
-</action>"""
- action = osc.core.Action.from_xml(ET.fromstring(xml))
- self.assertEqual(action.type, 'submit')
- self.assertEqual(action.src_project, 'foo')
- self.assertEqual(action.src_package, 'bar')
- self.assertEqual(action.tgt_project, 'foobar')
- self.assertEqual(action.tgt_package, 'bar')
- self.assertEqual(action.opt_sourceupdate, 'cleanup')
- self.assertEqual(action.opt_updatelink, '1')
- self.assertTrue(action.src_rev is None)
- self.assertEqual(xml, action.to_str())
-
- def test_action_from_xml3(self):
- """create action from xml (with acceptinfo element)"""
- from xml.etree import cElementTree as ET
- xml = """<action type="submit">
- <source package="bar" project="testprj" />
- <target package="baz" project="foobar" />
- <acceptinfo rev="5" srcmd5="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" xsrcmd5="ffffffffffffffffffffffffffffffff" />
-</action>"""
- action = osc.core.Action.from_xml(ET.fromstring(xml))
- self.assertEqual(action.type, 'submit')
- self.assertEqual(action.src_project, 'testprj')
- self.assertEqual(action.src_package, 'bar')
- self.assertEqual(action.tgt_project, 'foobar')
- self.assertEqual(action.tgt_package, 'baz')
- self.assertTrue(action.opt_sourceupdate is None)
- self.assertTrue(action.opt_updatelink is None)
- self.assertTrue(action.src_rev is None)
- self.assertEqual(action.acceptinfo_rev, '5')
- self.assertEqual(action.acceptinfo_srcmd5, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
- self.assertEqual(action.acceptinfo_xsrcmd5, 'ffffffffffffffffffffffffffffffff')
- self.assertTrue(action.acceptinfo_osrcmd5 is None)
- self.assertTrue(action.acceptinfo_oxsrcmd5 is None)
- self.assertEqual(xml, action.to_str())
-
- def test_action_from_xml_unknown_type(self):
- """try to create action from xml with unknown type"""
- from xml.etree import cElementTree as ET
- xml = '<action type="foo"><source package="bar" project="foo" /></action>'
- self.assertRaises(osc.oscerr.WrongArgs, osc.core.Action.from_xml, ET.fromstring(xml))
-
- def test_read_request1(self):
- """read in a request"""
- from xml.etree import cElementTree as ET
- xml = open(os.path.join(self._get_fixtures_dir(), 'test_read_request1.xml'), 'r').read().strip()
- r = osc.core.Request()
- r.read(ET.fromstring(xml))
- self.assertEqual(r.reqid, '42')
- self.assertEqual(r.actions[0].type, 'submit')
- self.assertEqual(r.actions[0].src_project, 'foo')
- self.assertEqual(r.actions[0].src_package, 'bar')
- self.assertEqual(r.actions[0].src_rev, '1')
- self.assertEqual(r.actions[0].tgt_project, 'foobar')
- self.assertEqual(r.actions[0].tgt_package, 'bar')
- self.assertTrue(r.actions[0].opt_sourceupdate is None)
- self.assertTrue(r.actions[0].opt_updatelink is None)
- self.assertEqual(r.actions[1].type, 'delete')
- self.assertEqual(r.actions[1].tgt_project, 'deleteme')
- self.assertTrue(r.actions[1].tgt_package is None)
- self.assertEqual(r.state.name, 'accepted')
- self.assertEqual(r.state.when, '2010-12-27T01:36:29')
- self.assertEqual(r.state.who, 'user1')
- self.assertEqual(r.state.comment, '')
- self.assertEqual(r.statehistory[0].name, 'new')
- self.assertEqual(r.statehistory[0].when, '2010-12-13T13:02:03')
- self.assertEqual(r.statehistory[0].who, 'creator')
- self.assertEqual(r.statehistory[0].comment, 'foobar')
- self.assertEqual(r.title, 'title of the request')
- self.assertEqual(r.description, 'this is a\nvery long\ndescription')
- self.assertTrue(len(r.statehistory) == 1)
- self.assertTrue(len(r.reviews) == 0)
- self.assertEqual(xml, r.to_str())
-
- def test_read_request2(self):
- """read in a request (with reviews)"""
- from xml.etree import cElementTree as ET
- xml = open(os.path.join(self._get_fixtures_dir(), 'test_read_request2.xml'), 'r').read().strip()
- r = osc.core.Request()
- r.read(ET.fromstring(xml))
- self.assertEqual(r.reqid, '123')
- self.assertEqual(r.actions[0].type, 'submit')
- self.assertEqual(r.actions[0].src_project, 'xyz')
- self.assertEqual(r.actions[0].src_package, 'abc')
- self.assertTrue(r.actions[0].src_rev is None)
- self.assertEqual(r.actions[0].opt_sourceupdate, 'cleanup')
- self.assertEqual(r.actions[0].opt_updatelink, '1')
- self.assertEqual(r.actions[1].type, 'add_role')
- self.assertEqual(r.actions[1].tgt_project, 'home:foo')
- self.assertEqual(r.actions[1].person_name, 'bar')
- self.assertEqual(r.actions[1].person_role, 'maintainer')
- self.assertEqual(r.actions[1].group_name, 'groupxyz')
- self.assertEqual(r.actions[1].group_role, 'reader')
- self.assertTrue(r.actions[1].tgt_package is None)
- self.assertEqual(r.state.name, 'review')
- self.assertEqual(r.state.when, '2010-12-27T01:36:29')
- self.assertEqual(r.state.who, 'abc')
- self.assertEqual(r.state.comment, '')
- self.assertEqual(r.reviews[0].state, 'new')
- self.assertEqual(r.reviews[0].by_group, 'group1')
- self.assertEqual(r.reviews[0].when, '2010-12-28T00:11:22')
- self.assertEqual(r.reviews[0].who, 'abc')
- self.assertEqual(r.reviews[0].comment, 'review start')
- self.assertTrue(r.reviews[0].by_user is None)
- self.assertEqual(r.statehistory[0].name, 'new')
- self.assertEqual(r.statehistory[0].when, '2010-12-11T00:00:00')
- self.assertEqual(r.statehistory[0].who, 'creator')
- self.assertEqual(r.statehistory[0].comment, '')
- self.assertEqual(r.get_creator(), 'creator')
- self.assertTrue(len(r.statehistory) == 1)
- self.assertTrue(len(r.reviews) == 1)
- self.assertEqual(xml, r.to_str())
-
- def test_read_request3(self):
- """read in a request (with an "empty" comment+description)"""
- from xml.etree import cElementTree as ET
- xml = """<request id="2">
- <action type="set_bugowner">
- <target project="foo" />
- <person name="buguser" />
- </action>
- <state name="new" when="2010-12-28T12:36:29" who="xyz">
- <comment></comment>
- </state>
- <description></description>
-</request>"""
- r = osc.core.Request()
- r.read(ET.fromstring(xml))
- self.assertEqual(r.reqid, '2')
- self.assertEqual(r.actions[0].type, 'set_bugowner')
- self.assertEqual(r.actions[0].tgt_project, 'foo')
- self.assertEqual(r.actions[0].person_name, 'buguser')
- self.assertEqual(r.state.name, 'new')
- self.assertEqual(r.state.when, '2010-12-28T12:36:29')
- self.assertEqual(r.state.who, 'xyz')
- self.assertEqual(r.state.comment, '')
- self.assertEqual(r.description, '')
- self.assertTrue(len(r.statehistory) == 0)
- self.assertTrue(len(r.reviews) == 0)
- self.assertEqual(r.get_creator(), 'xyz')
- exp = """<request id="2">
- <action type="set_bugowner">
- <target project="foo" />
- <person name="buguser" />
- </action>
- <state name="new" when="2010-12-28T12:36:29" who="xyz" />
-</request>"""
-
- self.assertEqual(exp, r.to_str())
-
- def test_request_list_view1(self):
- """test the list_view method"""
- from xml.etree import cElementTree as ET
- xml = open(os.path.join(self._get_fixtures_dir(), 'test_request_list_view1.xml'), 'r').read().strip()
- exp = """\
- 62 State:new By:Admin When:2010-12-29T14:57:25
- set_bugowner: buguser foo
- add_role: person: xyz as maintainer, group: group1 as reader foobar
- add_role: person: abc as reviewer foo/bar
- change_devel: foo/bar developed in devprj/devpkg
- submit: srcprj/srcpackage -> tgtprj/tgtpackage
- submit: foo/bar -> baz
- delete: deleteme
- delete: foo/bar\n"""
- r = osc.core.Request()
- r.read(ET.fromstring(xml))
- self.assertEqual(exp, r.list_view())
-
- def test_request_list_view2(self):
- """test the list_view method (with history elements and description)"""
- from xml.etree import cElementTree as ET
- xml = open(os.path.join(self._get_fixtures_dir(), 'test_request_list_view2.xml'), 'r').read().strip()
- r = osc.core.Request()
- r.read(ET.fromstring(xml))
- exp = """\
- 21 State:accepted By:foobar When:2010-12-29T16:37:45
- set_bugowner: buguser foo
- From: new(user) -> review(foobar)
- Descr: This is a simple request with a lot of ... ... text and other
- stuff. This request also contains a description. This is useful
- to describe the request. blabla blabla\n"""
- self.assertEqual(exp, r.list_view())
-
- def test_request_str1(self):
- from xml.etree import cElementTree as ET
- """test the __str__ method"""
- xml = open(os.path.join(self._get_fixtures_dir(), 'test_request_str1.xml'), 'r').read().strip()
- r = osc.core.Request()
- r = osc.core.Request()
- r.read(ET.fromstring(xml))
- self.assertEqual(r.get_creator(), 'creator')
- exp = """\
-Request: #123
-
- submit: xyz/abc(cleanup) -> foo
- add_role: person: bar as maintainer, group: groupxyz as reader home:foo
-
-
-Message:
-just a samll description
-in order to describe this
-request - blablabla
-test.
-
-State: review 2010-12-27T01:36:29 abc
-Comment: currently in review
-
-Review: accepted Group: group1 2010-12-29T00:11:22 abc accepted
- new Group: group1 2010-12-28T00:11:22 abc review start
-
-History: revoked 2010-12-12T00:00:00 creator
- new 2010-12-11T00:00:00 creator"""
- self.assertEqual(exp, str(r))
-
- def test_request_str2(self):
- """test the __str__ method"""
- from xml.etree import cElementTree as ET
- xml = """\
-<request id="98765">
- <action type="change_devel">
- <source project="devprj" package="devpkg" />
- <target project="foo" package="bar" />
- </action>
- <action type="delete">
- <target project="deleteme" />
- </action>
- <state name="new" when="2010-12-29T00:11:22" who="creator" />
-</request>"""
- r = osc.core.Request()
- r.read(ET.fromstring(xml))
- self.assertEqual(r.get_creator(), 'creator')
- exp = """\
-Request: #98765
-
- change_devel: foo/bar developed in devprj/devpkg
- delete: deleteme
-
-
-Message:
-<no message>
-
-State: new 2010-12-29T00:11:22 creator
-Comment: <no comment>"""
- self.assertEqual(exp, str(r))
-
- def test_legacy_request(self):
- """load old-style submitrequest"""
- from xml.etree import cElementTree as ET
- xml = """\
-<request id="1234" type="submit">
- <submit>
- <source package="baz" project="foobar" />
- <target package="baz" project="foo" />
- </submit>
- <state name="new" when="2010-12-30T02:11:22" who="olduser" />
-</request>"""
- r = osc.core.Request()
- r.read(ET.fromstring(xml))
- self.assertEqual(r.reqid, '1234')
- self.assertEqual(r.actions[0].type, 'submit')
- self.assertEqual(r.actions[0].src_project, 'foobar')
- self.assertEqual(r.actions[0].src_package, 'baz')
- self.assertEqual(r.actions[0].tgt_project, 'foo')
- self.assertEqual(r.actions[0].tgt_package, 'baz')
- self.assertTrue(r.actions[0].opt_sourceupdate is None)
- self.assertTrue(r.actions[0].opt_updatelink is None)
- self.assertEqual(r.state.name, 'new')
- self.assertEqual(r.state.when, '2010-12-30T02:11:22')
- self.assertEqual(r.state.who, 'olduser')
- self.assertEqual(r.state.comment, '')
- self.assertEqual(r.get_creator(), 'olduser')
- exp = """\
-<request id="1234">
- <action type="submit">
- <source package="baz" project="foobar" />
- <target package="baz" project="foo" />
- </action>
- <state name="new" when="2010-12-30T02:11:22" who="olduser" />
-</request>"""
- self.assertEqual(exp, r.to_str())
-
- def test_get_actions(self):
- """test get_actions method"""
- from xml.etree import cElementTree as ET
- xml = open(os.path.join(self._get_fixtures_dir(), 'test_request_list_view1.xml'), 'r').read().strip()
- r = osc.core.Request()
- r.read(ET.fromstring(xml))
- sr_actions = r.get_actions('submit')
- self.assertTrue(len(sr_actions) == 2)
- for i in sr_actions:
- self.assertEqual(i.type, 'submit')
- self.assertTrue(len(r.get_actions('submit', 'delete', 'change_devel')) == 5)
- self.assertTrue(len(r.get_actions()) == 8)
-
-if __name__ == '__main__':
- import unittest
- unittest.main()
+++ /dev/null
-import osc.core
-import osc.oscerr
-import os
-from common import OscTestCase
-
-FIXTURES_DIR = os.path.join(os.getcwd(), 'revertfile_fixtures')
-
-def suite():
- import unittest
- return unittest.makeSuite(TestRevertFiles)
-
-class TestRevertFiles(OscTestCase):
- def _get_fixtures_dir(self):
- return FIXTURES_DIR
-
- def testRevertUnchanged(self):
- """revert an unchanged file (state == ' ')"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- self.assertRaises(osc.oscerr.OscIOError, p.revert, 'toadd2')
- self._check_status(p, 'toadd2', '?')
-
- def testRevertModified(self):
- """revert a modified file"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.revert('nochange')
- self.__check_file('nochange')
- self._check_status(p, 'nochange', ' ')
-
- def testRevertAdded(self):
- """revert an added file"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.revert('toadd1')
- self.assertTrue(os.path.exists('toadd1'))
- self._check_addlist('replaced\naddedmissing\n')
- self._check_status(p, 'toadd1', '?')
-
- def testRevertDeleted(self):
- """revert a deleted file"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.revert('somefile')
- self.__check_file('somefile')
- self._check_deletelist('deleted\n')
- self._check_status(p, 'somefile', ' ')
-
- def testRevertMissing(self):
- """revert a missing (state == '!') file"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.revert('missing')
- self.__check_file('missing')
- self._check_status(p, 'missing', ' ')
-
- def testRevertMissingAdded(self):
- """revert a missing file which was added to the wc"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.revert('addedmissing')
- self._check_addlist('toadd1\nreplaced\n')
- self.assertRaises(osc.oscerr.OscIOError, p.status, 'addedmissing')
-
- def testRevertReplaced(self):
- """revert a replaced (state == 'R') file"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.revert('replaced')
- self.__check_file('replaced')
- self._check_addlist('toadd1\naddedmissing\n')
- self._check_status(p, 'replaced', ' ')
-
- def testRevertConflict(self):
- """revert a file which is in the conflict state"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- p.revert('foo')
- self.__check_file('foo')
- self.assertFalse(os.path.exists(os.path.join('.osc', '_in_conflict')))
- self._check_status(p, 'foo', ' ')
-
- def testRevertSkipped(self):
- """revert a skipped file"""
- self._change_to_pkg('simple')
- p = osc.core.Package('.')
- self.assertRaises(osc.oscerr.OscIOError, p.revert, 'skipped')
-
- def __check_file(self, fname):
- storefile = os.path.join('.osc', fname)
- self.assertTrue(os.path.exists(fname))
- self.assertTrue(os.path.exists(storefile))
- self.assertEqual(open(fname, 'r').read(), open(storefile, 'r').read())
-
-if __name__ == '__main__':
- import unittest
- unittest.main()
+++ /dev/null
-import osc.core
-import osc.oscerr
-import os
-from common import GET, PUT, OscTestCase
-FIXTURES_DIR = os.path.join(os.getcwd(), 'setlinkrev_fixtures')
-
-def suite():
- import unittest
- return unittest.makeSuite(TestSetLinkRev)
-
-class TestSetLinkRev(OscTestCase):
- def setUp(self):
- OscTestCase.setUp(self, copytree=False)
-
- def _get_fixtures_dir(self):
- return FIXTURES_DIR
-
- @GET('http://localhost/source/osctest/simple/_link', file='simple_link')
- @GET('http://localhost/source/srcprj/srcpkg?rev=latest', file='simple_filesremote')
- @PUT('http://localhost/source/osctest/simple/_link',
- exp='<link package="srcpkg" project="srcprj" rev="42" />', text='dummytext')
- def test_simple1(self):
- """a simple set_link_rev call without revision"""
- osc.core.set_link_rev('http://localhost', 'osctest', 'simple')
-
- @GET('http://localhost/source/osctest/simple/_link', file='simple_link')
- @PUT('http://localhost/source/osctest/simple/_link',
- exp='<link package="srcpkg" project="srcprj" rev="42" />', text='dummytext')
- def test_simple2(self):
- """a simple set_link_rev call with revision"""
- osc.core.set_link_rev('http://localhost', 'osctest', 'simple', '42')
-
- @GET('http://localhost/source/osctest/simple/_link', file='noproject_link')
- @GET('http://localhost/source/osctest/srcpkg?rev=latest&expand=1', file='expandedsrc_filesremote')
- @PUT('http://localhost/source/osctest/simple/_link',
- exp='<link package="srcpkg" rev="eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" vrev="1" />', text='dummytext')
- def test_expandedsrc(self):
- """expand src package"""
- osc.core.set_link_rev('http://localhost', 'osctest', 'simple', expand=True)
-
- @GET('http://localhost/source/osctest/simple/_link', file='simple_link')
- @GET('http://localhost/source/srcprj/srcpkg?linkrev=base&rev=latest&expand=1', file='baserev_filesremote')
- @PUT('http://localhost/source/osctest/simple/_link',
- exp='<link package="srcpkg" project="srcprj" rev="abcdeeeeeeeeeeeeeeeeeeeeeeeeeeee" vrev="1" />', text='dummytext')
- def test_baserev(self):
- """expanded baserev revision"""
- osc.core.set_link_rev('http://localhost', 'osctest', 'simple', baserev=True)
-
- @GET('http://localhost/source/osctest/simple/_link', file='simple_link')
- @GET('http://localhost/source/srcprj/srcpkg?rev=latest&expand=1', text='conflict in file merge', code=404)
- def test_linkerror(self):
- """link is broken"""
- import urllib2
- # the backend returns status 404 if we try to expand a broken _link
- self.assertRaises(urllib2.HTTPError, osc.core.set_link_rev, 'http://localhost', 'osctest', 'simple', expand=True)
-
- @GET('http://localhost/source/osctest/simple/_link', file='rev_link')
- @PUT('http://localhost/source/osctest/simple/_link',
- exp='<link package="srcpkg" project="srcprj" />', text='dummytext')
- def test_deleterev(self):
- """delete rev attribute from link xml"""
- osc.core.set_link_rev('http://localhost', 'osctest', 'simple', revision=None)
-
- @GET('http://localhost/source/osctest/simple/_link', file='simple_link')
- @PUT('http://localhost/source/osctest/simple/_link',
- exp='<link package="srcpkg" project="srcprj" />', text='dummytext')
- def test_deleterevnonexistent(self):
- """delete non existent rev attribute from link xml"""
- osc.core.set_link_rev('http://localhost', 'osctest', 'simple', revision=None)
-
-if __name__ == '__main__':
- import unittest
- unittest.main()
+++ /dev/null
-import osc.core
-import osc.oscerr
-import os
-import sys
-from common import GET, OscTestCase
-FIXTURES_DIR = os.path.join(os.getcwd(), 'update_fixtures')
-
-def suite():
- import unittest
- return unittest.makeSuite(TestUpdate)
-
-class TestUpdate(OscTestCase):
- def _get_fixtures_dir(self):
- return FIXTURES_DIR
-
- @GET('http://localhost/source/osctest/simple?rev=latest', file='testUpdateNoChanges_files')
- @GET('http://localhost/source/osctest/simple/_meta', file='meta.xml')
- def testUpdateNoChanges(self):
- """update without any changes (the wc is the most recent version)"""
- self._change_to_pkg('simple')
- osc.core.Package('.').update()
- self.assertEqual(sys.stdout.getvalue(), 'At revision 1.\n')
-
- @GET('http://localhost/source/osctest/simple?rev=2', file='testUpdateNewFile_files')
- @GET('http://localhost/source/osctest/simple/upstream_added?rev=2', file='testUpdateNewFile_upstream_added')
- @GET('http://localhost/source/osctest/simple/_meta', file='meta.xml')
- def testUpdateNewFile(self):
- """a new file was added to the remote package"""
- self._change_to_pkg('simple')
- osc.core.Package('.').update(rev=2)
- exp = 'A upstream_added\nAt revision 2.\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self._check_digests('testUpdateNewFile_files')
-
- @GET('http://localhost/source/osctest/simple?rev=2', file='testUpdateNewFileLocalExists_files')
- def testUpdateNewFileLocalExists(self):
- """
- a new file was added to the remote package but the same (unversioned)
- file exists locally
- """
- self._change_to_pkg('simple')
- self.assertRaises(osc.oscerr.PackageFileConflict, osc.core.Package('.').update, rev=2)
-
- @GET('http://localhost/source/osctest/simple?rev=2', file='testUpdateDeletedFile_files')
- @GET('http://localhost/source/osctest/simple/_meta', file='meta.xml')
- def testUpdateDeletedFile(self):
- """a file was deleted from the remote package"""
- self._change_to_pkg('simple')
- osc.core.Package('.').update(rev=2)
- exp = 'D foo\nAt revision 2.\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self._check_digests('testUpdateDeletedFile_files')
- self.assertFalse(os.path.exists('foo'))
- self.assertFalse(os.path.exists(os.path.join('.osc', 'foo')))
-
- @GET('http://localhost/source/osctest/simple?rev=2', file='testUpdateUpstreamModifiedFile_files')
- @GET('http://localhost/source/osctest/simple/foo?rev=2', file='testUpdateUpstreamModifiedFile_foo')
- @GET('http://localhost/source/osctest/simple/_meta', file='meta.xml')
- def testUpdateUpstreamModifiedFile(self):
- """a file was modified in the remote package (local file isn't modified)"""
-
- self._change_to_pkg('simple')
- osc.core.Package('.').update(rev=2)
- exp = 'U foo\nAt revision 2.\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self._check_digests('testUpdateUpstreamModifiedFile_files')
-
- @GET('http://localhost/source/osctest/conflict?rev=2', file='testUpdateConflict_files')
- @GET('http://localhost/source/osctest/conflict/merge?rev=2', file='testUpdateConflict_merge')
- @GET('http://localhost/source/osctest/conflict/_meta', file='meta.xml')
- def testUpdateConflict(self):
- """
- a file was modified in the remote package (local file is also modified
- and a merge isn't possible)
- """
- self._change_to_pkg('conflict')
- osc.core.Package('.').update(rev=2)
- exp = 'C merge\nAt revision 2.\n'
- self._check_digests('testUpdateConflict_files')
- self.assertEqual(sys.stdout.getvalue(), exp)
- self._check_conflictlist('merge\n')
-
- @GET('http://localhost/source/osctest/already_in_conflict?rev=2', file='testUpdateAlreadyInConflict_files')
- @GET('http://localhost/source/osctest/already_in_conflict/merge?rev=2', file='testUpdateAlreadyInConflict_merge')
- @GET('http://localhost/source/osctest/already_in_conflict/_meta', file='meta.xml')
- def testUpdateAlreadyInConflict(self):
- """
- a file was modified in the remote package (the local file is already in conflict)
- """
- self._change_to_pkg('already_in_conflict')
- osc.core.Package('.').update(rev=2)
- exp = 'skipping \'merge\' (this is due to conflicts)\nAt revision 2.\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self._check_conflictlist('merge\n')
- self._check_digests('testUpdateAlreadyInConflict_files')
-
- @GET('http://localhost/source/osctest/deleted?rev=2', file='testUpdateLocalDeletions_files')
- @GET('http://localhost/source/osctest/deleted/foo?rev=2', file='testUpdateLocalDeletions_foo')
- @GET('http://localhost/source/osctest/deleted/merge?rev=2', file='testUpdateLocalDeletions_merge')
- @GET('http://localhost/source/osctest/deleted/_meta', file='meta.xml')
- def testUpdateLocalDeletions(self):
- """
- the files 'foo' and 'merge' were modified in the remote package
- and marked for deletion in the local wc. Additionally the file
- 'merge' was modified in the wc before deletion so the local file
- still exists (and a merge with the remote file is not possible)
- """
- self._change_to_pkg('deleted')
- osc.core.Package('.').update(rev=2)
- exp = 'U foo\nC merge\nAt revision 2.\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self._check_deletelist('foo\n')
- self._check_conflictlist('merge\n')
- self.assertEqual(open('foo', 'r').read(), open(os.path.join('.osc', 'foo'), 'r').read())
- self._check_digests('testUpdateLocalDeletions_files')
-
- @GET('http://localhost/source/osctest/restore?rev=latest', file='testUpdateRestore_files')
- @GET('http://localhost/source/osctest/restore/foo?rev=1', file='testUpdateRestore_foo')
- @GET('http://localhost/source/osctest/restore/_meta', file='meta.xml')
- def testUpdateRestore(self):
- """local file 'foo' was deleted with a non osc command and will be restored"""
- self._change_to_pkg('restore')
- osc.core.Package('.').update()
- exp = 'Restored \'foo\'\nAt revision 1.\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self._check_digests('testUpdateRestore_files')
-
- @GET('http://localhost/source/osctest/limitsize?rev=latest', file='testUpdateLimitSizeNoChange_filesremote')
- @GET('http://localhost/source/osctest/limitsize/_meta', file='meta.xml')
- def testUpdateLimitSizeNoChange(self):
- """
- a new file was added to the remote package but isn't checked out because
- of the size constraint
- """
- self._change_to_pkg('limitsize')
- osc.core.Package('.').update(size_limit=50)
- exp = 'D bigfile\nAt revision 2.\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self.assertFalse(os.path.exists(os.path.join('.osc', 'bigfile')))
- self.assertFalse(os.path.exists('bigfile'))
- self._check_digests('testUpdateLimitSizeNoChange_files', 'bigfile')
-
- @GET('http://localhost/source/osctest/limitsize_local?rev=latest', file='testUpdateLocalLimitSizeNoChange_filesremote')
- @GET('http://localhost/source/osctest/limitsize_local/_meta', file='meta.xml')
- def testUpdateLocalLimitSizeNoChange(self):
- """
- a new file was added to the remote package but isn't checked out because
- of the local size constraint
- """
- self._change_to_pkg('limitsize_local')
- p = osc.core.Package('.')
- p.update()
- exp = 'D bigfile\nD merge\nAt revision 2.\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self.assertFalse(os.path.exists(os.path.join('.osc', 'bigfile')))
- self.assertFalse(os.path.exists(os.path.join('.osc', 'merge')))
- self.assertFalse(os.path.exists('bigfile'))
- self._check_digests('testUpdateLocalLimitSizeNoChange_files', 'bigfile', 'merge')
- self._check_status(p, 'bigfile', 'S')
- self._check_status(p, 'merge', 'S')
-
- @GET('http://localhost/source/osctest/limitsize?rev=latest', file='testUpdateLimitSizeAddDelete_filesremote')
- @GET('http://localhost/source/osctest/limitsize/exists?rev=2', file='testUpdateLimitSizeAddDelete_exists')
- @GET('http://localhost/source/osctest/limitsize/_meta', file='meta.xml')
- def testUpdateLimitSizeAddDelete(self):
- """
- a new file (exists) was added to the remote package with
- size < size_limit and one file (nochange) was deleted from the
- remote package (local file 'nochange' is modified). Additionally
- files which didn't change are removed the local wc due to the
- size constraint.
- """
- self._change_to_pkg('limitsize')
- osc.core.Package('.').update(size_limit=10)
- exp = 'A exists\nD bigfile\nD foo\nD merge\nD nochange\nAt revision 2.\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self.assertFalse(os.path.exists(os.path.join('.osc', 'bigfile')))
- self.assertFalse(os.path.exists('bigfile'))
- self.assertFalse(os.path.exists(os.path.join('.osc', 'foo')))
- self.assertFalse(os.path.exists('foo'))
- self.assertFalse(os.path.exists(os.path.join('.osc', 'merge')))
- self.assertFalse(os.path.exists('merge'))
- # exists because local version is modified
- self.assertTrue(os.path.exists('nochange'))
-
- self._check_digests('testUpdateLimitSizeAddDelete_files', 'bigfile', 'foo', 'merge', 'nochange')
-
- @GET('http://localhost/source/osctest/services?rev=latest', file='testUpdateServiceFilesAddDelete_filesremote')
- @GET('http://localhost/source/osctest/services/bigfile?rev=2', file='testUpdateServiceFilesAddDelete_bigfile')
- @GET('http://localhost/source/osctest/services/_service%3Abar?rev=2', file='testUpdateServiceFilesAddDelete__service:bar')
- @GET('http://localhost/source/osctest/services/_service%3Afoo?rev=2', file='testUpdateServiceFilesAddDelete__service:foo')
- @GET('http://localhost/source/osctest/services/_meta', file='meta.xml')
- def testUpdateAddDeleteServiceFiles(self):
- """update package with _service:* files"""
- self._change_to_pkg('services')
- osc.core.Package('.').update(service_files=True)
- exp = 'A bigfile\nD _service:exists\nA _service:bar\nA _service:foo\nAt revision 2.\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self.assertFalse(os.path.exists(os.path.join('.osc', '_service:bar')))
- self.assertTrue(os.path.exists('_service:bar'))
- self.assertEqual(open('_service:bar').read(), 'another service\n')
- self.assertFalse(os.path.exists(os.path.join('.osc', '_service:foo')))
- self.assertTrue(os.path.exists('_service:foo'))
- self.assertEqual(open('_service:foo').read(), 'small\n')
- self.assertTrue(os.path.exists('_service:exists'))
- self._check_digests('testUpdateServiceFilesAddDelete_files', '_service:foo', '_service:bar')
-
- @GET('http://localhost/source/osctest/services?rev=latest', file='testUpdateServiceFilesAddDelete_filesremote')
- @GET('http://localhost/source/osctest/services/bigfile?rev=2', file='testUpdateServiceFilesAddDelete_bigfile')
- @GET('http://localhost/source/osctest/services/_meta', file='meta.xml')
- def testUpdateDisableAddDeleteServiceFiles(self):
- """update package with _service:* files (with service_files=False)"""
- self._change_to_pkg('services')
- osc.core.Package('.').update()
- exp = 'A bigfile\nD _service:exists\nAt revision 2.\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self.assertFalse(os.path.exists(os.path.join('.osc', '_service:bar')))
- self.assertFalse(os.path.exists('_service:bar'))
- self.assertFalse(os.path.exists(os.path.join('.osc', '_service:foo')))
- self.assertFalse(os.path.exists('_service:foo'))
- self.assertTrue(os.path.exists('_service:exists'))
- self._check_digests('testUpdateServiceFilesAddDelete_files', '_service:foo', '_service:bar')
-
- @GET('http://localhost/source/osctest/metamode?meta=1&rev=latest', file='testUpdateMetaMode_filesremote')
- @GET('http://localhost/source/osctest/metamode/_meta?rev=1', file='testUpdateMetaMode__meta')
- def testUpdateMetaMode(self):
- """update package with metamode enabled"""
- self._change_to_pkg('metamode')
- p = osc.core.Package('.')
- p.update()
- exp = 'A _meta\nD foo\nD merge\nD nochange\nAt revision 1.\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self.assertFalse(os.path.exists('foo'))
- self.assertFalse(os.path.exists('merge'))
- self.assertFalse(os.path.exists('nochange'))
- self._check_digests('testUpdateMetaMode_filesremote')
- self._check_status(p, '_meta', ' ')
-
- @GET('http://localhost/source/osctest/new?rev=latest', file='testUpdateNew_filesremote')
- @GET('http://localhost/source/osctest/new/_meta', file='meta.xml')
- def testUpdateNew(self):
- """update a new (empty) package. The package has no revision."""
- self._change_to_pkg('new')
- p = osc.core.Package('.')
- p.update()
- exp = 'At revision None.\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self._check_digests('testUpdateNew_filesremote')
-
- # tests to recover from an aborted/broken update
-
- @GET('http://localhost/source/osctest/simple/foo?rev=2', file='testUpdateResume_foo')
- @GET('http://localhost/source/osctest/simple/merge?rev=2', file='testUpdateResume_merge')
- @GET('http://localhost/source/osctest/simple/_meta', file='meta.xml')
- @GET('http://localhost/source/osctest/simple?rev=2', file='testUpdateResume_files')
- @GET('http://localhost/source/osctest/simple/_meta', file='meta.xml')
- def testUpdateResume(self):
- """resume an aborted update"""
- self._change_to_pkg('resume')
- osc.core.Package('.').update(rev=2)
- exp = 'resuming broken update...\nU foo\nU merge\nAt revision 2.\nAt revision 2.\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self.assertFalse(os.path.exists(os.path.join('.osc', '_in_update')))
- self._check_digests('testUpdateResume_files')
-
- @GET('http://localhost/source/osctest/simple/foo?rev=1', file='testUpdateResumeDeletedFile_foo')
- @GET('http://localhost/source/osctest/simple/merge?rev=1', file='testUpdateResumeDeletedFile_merge')
- @GET('http://localhost/source/osctest/simple/_meta', file='meta.xml')
- @GET('http://localhost/source/osctest/simple?rev=1', file='testUpdateResumeDeletedFile_files')
- @GET('http://localhost/source/osctest/simple/_meta', file='meta.xml')
- def testUpdateResumeDeletedFile(self):
- """
- resume an aborted update (the file 'added' was already deleted in the first update
- run). It's marked as deleted again (this is due to an expected issue with the update
- code)
- """
- self._change_to_pkg('resume_deleted')
- osc.core.Package('.').update(rev=1)
- exp = 'resuming broken update...\nD added\nU foo\nU merge\nAt revision 1.\nAt revision 1.\n'
- self.assertEqual(sys.stdout.getvalue(), exp)
- self.assertFalse(os.path.exists(os.path.join('.osc', '_in_update')))
- self.assertFalse(os.path.exists('added'))
- self.assertFalse(os.path.exists(os.path.join('.osc', 'added')))
- self._check_digests('testUpdateResumeDeletedFile_files')
-
-if __name__ == '__main__':
- import unittest
- unittest.main()
+++ /dev/null
-<package project="osctest" name="simple">
- <title/>
- <description>
-
- </description>
- <person userid="Admin" role="maintainer"/>
- <person userid="Admin" role="bugowner"/>
-</package>
\ No newline at end of file
+++ /dev/null
-[general]
-# URL to access API server, e.g. https://api.opensuse.org
-# you also need a section [https://api.opensuse.org] with the credentials
-apiurl = http://localhost
-# Downloaded packages are cached here. Must be writable by you.
-#packagecachedir = /var/tmp/osbuild-packagecache
-# Wrapper to call build as root (sudo, su -, ...)
-#su-wrapper = su -c
-# rootdir to setup the chroot environment
-# can contain %(repo)s, %(arch)s, %(project)s and %(package)s for replacement, e.g.
-# /srv/oscbuild/%(repo)s-%(arch)s or
-# /srv/oscbuild/%(repo)s-%(arch)s-%(project)s-%(package)s
-#build-root = /var/tmp/build-root
-# compile with N jobs (default: "getconf _NPROCESSORS_ONLN")
-#build-jobs = N
-# build-type to use - values can be (depending on the capabilities of the 'build' script)
-# empty - chroot build
-# kvm - kvm VM build (needs build-device, build-swap, build-memory)
-# xen - xen VM build (needs build-device, build-swap, build-memory)
-# experimental:
-# qemu - qemu VM build
-# lxc - lxc build
-#build-type =
-# build-device is the disk-image file to use as root for VM builds
-# e.g. /var/tmp/FILE.root
-#build-device = /var/tmp/FILE.root
-# build-swap is the disk-image to use as swap for VM builds
-# e.g. /var/tmp/FILE.swap
-#build-swap = /var/tmp/FILE.swap
-# build-memory is the amount of memory used in the VM
-# value in MB - e.g. 512
-#build-memory = 512
-# build-vmdisk-rootsize is the size of the disk-image used as root in a VM build
-# values in MB - e.g. 4096
-#build-vmdisk-rootsize = 4096
-# build-vmdisk-swapsize is the size of the disk-image used as swap in a VM build
-# values in MB - e.g. 1024
-#build-vmdisk-swapsize = 1024
-# Numeric uid:gid to assign to the "abuild" user in the build-root
-# or "caller" to use the current users uid:gid
-# This is convenient when sharing the buildroot with ordinary userids
-# on the host.
-# This should not be 0
-# build-uid =
-# extra packages to install when building packages locally (osc build)
-# this corresponds to osc build's -x option and can be overridden with that
-# -x '' can also be given on the command line to override this setting, or
-# you can have an empty setting here.
-#extra-pkgs = vim gdb strace
-# build platform is used if the platform argument is omitted to osc build
-#build_repository = openSUSE_Factory
-# default project for getpac or bco
-#getpac_default_project = openSUSE:Factory
-# alternate filesystem layout: have multiple subdirs, where colons were.
-#checkout_no_colon = 0
-# local files to ignore with status, addremove, ....
-#exclude_glob = .osc CVS .svn .* _linkerror *~ #*# *.orig *.bak *.changes.*
-# keep passwords in plaintext. If you see this comment, your osc
-# already uses the encrypted password, and only keeps them in plain text
-# for backwards compatibility. Default will change to 0 in future releases.
-# You can remove the plaintext password without harm, if you do not need
-# backwards compatibility.
-#plaintext_passwd = 1
-# limit the age of requests shown with 'osc req list'.
-# this is a default only, can be overridden by 'osc req list -D NNN'
-# Use 0 for unlimted.
-#request_list_days = 0
-# show info useful for debugging
-#debug = 1
-# show HTTP traffic useful for debugging
-#http_debug = 1
-# Skip signature verification of packages used for build.
-#no_verify = 1
-# jump into the debugger in case of errors
-#post_mortem = 1
-# print call traces in case of errors
-#traceback = 1
-# use KDE/Gnome/MacOS/Windows keyring for credentials if available
-#use_keyring = 1
-# check for unversioned/removed files before commit
-#check_filelist = 1
-# check for pending requests after executing an action (e.g. checkout, update, commit)
-#check_for_request_on_action = 0
-# what to do with the source package if the submitrequest has been accepted. If
-# nothing is specified the API default is used
-#submitrequest_on_accept_action = cleanup|update|noupdate
-#review requests interactively (default: off)
-#request_show_review = 1
-# Directory with executables to validate sources, esp before committing
-#source_validator_directory = /usr/lib/osc/source_validators
-
-[http://localhost]
-user=Admin
-pass=opensuse
-# set aliases for this apiurl
-# aliases = foo, bar
-# email used in .changes, unless the one from osc meta prj <user> will be used
-# email =
-# additional headers to pass to a request, e.g. for special authentication
-#http_headers = Host: foofoobar,
-# User: mumblegack
-# Force using of keyring for this API
-#keyring = 1
+++ /dev/null
-http://localhost
+++ /dev/null
-<project name="osctest" />
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="already_in_conflict" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282133912" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282133912" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282133912" name="nochange" size="25" />
-</directory>
\ No newline at end of file
+++ /dev/null
-<package project="osctest" name="already_in_conflict">
- <title/>
- <description>
-
- </description>
- <person userid="Admin" role="maintainer"/>
- <person userid="Admin" role="bugowner"/>
-</package>
\ No newline at end of file
+++ /dev/null
-already_in_conflict
\ No newline at end of file
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="conflict" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282130148" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282130148" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282130148" name="nochange" size="25" />
-</directory>
\ No newline at end of file
+++ /dev/null
-conflict
\ No newline at end of file
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it possible
-to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="deleted" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282134731" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282134731" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282134731" name="nochange" size="25" />
-</directory>
\ No newline at end of file
+++ /dev/null
-deleted
\ No newline at end of file
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-merge
-foo
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-Is it possible to,
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="limitsize" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="limitsize" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-limitsize_local
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
\ No newline at end of file
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="new" />
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="restore" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="ff22941336956098ae9a564289d1bf1b" mtime="1282137256" name="added" size="15" />
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-<directory name="simple" rev="2" srcmd5="3ac41c59a5ed169d5ffef4d824700f7d" vrev="2">
- <entry md5="ff22941336956098ae9a564289d1bf1b" mtime="1282137256" name="added" size="15" />
- <entry md5="14758f1afd44c09b7992073ccf00b43d" mtime="1282137220" name="foo" size="7" />
- <entry md5="256d8f76ba7a0a231fb46a84866f25d8" mtime="1282137238" name="merge" size="20" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-This is a simple test.
+++ /dev/null
-<package project="osctest" name="simple">
- <title/>
- <description>
-
- </description>
- <person userid="Admin" role="maintainer"/>
- <person userid="Admin" role="bugowner"/>
-</package>
\ No newline at end of file
+++ /dev/null
-simple
\ No newline at end of file
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a test
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-This is a test
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="3ac41c59a5ed169d5ffef4d824700f7d" vrev="1">
- <entry md5="d41d8cd98f00b204e9800998ecf8427e" mtime="1282137256" name="added" size="15" />
- <entry md5="14758f1afd44c09b7992073ccf00b43d" mtime="1282137220" name="foo" size="7" />
- <entry md5="256d8f76ba7a0a231fb46a84866f25d8" mtime="1282137238" name="merge" size="20" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
\ No newline at end of file
+++ /dev/null
-<package project="osctest" name="simple">
- <title/>
- <description>
-
- </description>
- <person userid="Admin" role="maintainer"/>
- <person userid="Admin" role="bugowner"/>
-</package>
\ No newline at end of file
+++ /dev/null
-simple
\ No newline at end of file
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-xxx
-xxx
-yyy
-zzz
-zzz
+++ /dev/null
-This file didn't change.
+++ /dev/null
-This is a test
+++ /dev/null
-xxx
-xxx
-yyy
-zzz
-zzz
+++ /dev/null
-This file didn't change.
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="foo" rev="1" srcmd5="b9f060f4b3640e58a1d44abc25ffb9bd" vrev="1">
- <entry md5="7b1458c733a187d4f3807665ddd02cca" mtime="1282565027" name="_service:exists" size="20" skipped="true" />
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282320303" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282320303" name="merge" size="48" />
-</directory>
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-another service
-foo
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-http://localhost
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
\ No newline at end of file
+++ /dev/null
-simple
\ No newline at end of file
+++ /dev/null
-osctest
\ No newline at end of file
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change.
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-This file didn't change but
-is modified.
+++ /dev/null
-<directory name="already_in_conflict" rev="2" srcmd5="686b725018c89978678e15daa666ff85" vrev="2">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282133912" name="foo" size="23" />
- <entry md5="14758f1afd44c09b7992073ccf00b43d" mtime="1282134056" name="merge" size="7" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282133912" name="nochange" size="25" />
-</directory>
+++ /dev/null
-<directory name="conflict" rev="2" srcmd5="6463d0bd161765e9a2b7186606c72ca1" vrev="2">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282130148" name="foo" size="23" />
- <entry md5="89fcd308c6e6919c472e56ec82ace945" mtime="1282130545" name="merge" size="46" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282130148" name="nochange" size="25" />
-</directory>
+++ /dev/null
-Is
-it possible to
-merge this file?
-We'll see.
+++ /dev/null
-<directory name="simple" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2">
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-<directory name="foo" rev="2" srcmd5="018a80019e08143e7ae324c778873d62" vrev="2">
- <entry md5="ed955c917012307d982b7cdd5799ff1a" mtime="1282320398" name="bigfile" size="69" skipped="true" />
- <entry md5="d15dbfcb847653913855e21370d83af1" mtime="1282553634" name="exists" size="6" />
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282320303" name="foo" size="23" skipped="true" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282320303" name="merge" size="48" skipped="true" />
-</directory>
+++ /dev/null
-<directory name="foo" rev="2" vrev="2" srcmd5="018a80019e08143e7ae324c778873d62">
- <entry name="bigfile" md5="ed955c917012307d982b7cdd5799ff1a" size="69" mtime="1282320398" />
- <entry name="exists" md5="d15dbfcb847653913855e21370d83af1" size="6" mtime="1282553634" />
- <entry name="foo" md5="0d62ceea6020d75154078a20d8c9f9ba" size="23" mtime="1282320303" />
- <entry name="merge" md5="17b9e9e1a032ed44e7a584dc6303ffa8" size="48" mtime="1282320303" />
-</directory>
+++ /dev/null
-<directory name="limitsize" rev="2" srcmd5="e51a3133d3d3eb2a48e06efb79e2d503" vrev="2">
- <entry md5="ed955c917012307d982b7cdd5799ff1a" mtime="1282320398" name="bigfile" size="69" skipped="true" />
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282320303" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282320303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-<directory name="limitsize" rev="2" vrev="2" srcmd5="e51a3133d3d3eb2a48e06efb79e2d503">
- <entry name="bigfile" md5="ed955c917012307d982b7cdd5799ff1a" size="69" mtime="1282320398" />
- <entry name="foo" md5="0d62ceea6020d75154078a20d8c9f9ba" size="23" mtime="1282320303" />
- <entry name="merge" md5="17b9e9e1a032ed44e7a584dc6303ffa8" size="48" mtime="1282320303" />
- <entry name="nochange" md5="7efa70f68983fad1cf487f69dedf93e9" size="25" mtime="1282047303" />
-</directory>
+++ /dev/null
-<directory name="deleted" rev="2" srcmd5="0e717058d371ab9029336418c8c883bd" vrev="2">
- <entry md5="2bb5f888a0063a0931c12f35851953e4" mtime="1282135005" name="foo" size="37" />
- <entry md5="426e11f11438365322f102c02b0a33f0" mtime="1282134896" name="merge" size="50" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282134731" name="nochange" size="25" />
-</directory>
+++ /dev/null
-This is a simple test.
-And an update
+++ /dev/null
-Is
-it possible to
-merge this file?
-We'll see. Foo
+++ /dev/null
-<directory name="limitsize_local" rev="2" srcmd5="e51a3133d3d3eb2a48e06efb79e2d503" vrev="2">
- <entry md5="ed955c917012307d982b7cdd5799ff1a" mtime="1282320398" name="bigfile" size="69" skipped="true" />
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282320303" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282320303" name="merge" size="48" skipped="true" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-<directory name="limitsize_local" rev="2" vrev="2" srcmd5="e51a3133d3d3eb2a48e06efb79e2d503">
- <entry name="bigfile" md5="ed955c917012307d982b7cdd5799ff1a" size="69" mtime="1282320398" />
- <entry name="foo" md5="0d62ceea6020d75154078a20d8c9f9ba" size="23" mtime="1282320303" />
- <entry name="merge" md5="17b9e9e1a032ed44e7a584dc6303ffa8" size="48" mtime="1282320303" />
- <entry name="nochange" md5="7efa70f68983fad1cf487f69dedf93e9" size="25" mtime="1282047303" />
-</directory>
+++ /dev/null
-<package project="osctest" name="metamode">
- <title>foo</title>
- <description />
-</package>
+++ /dev/null
-<directory name="metamode" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="b995ef5586bdb37154bdeac0bda18c51" mtime="1283265642" name="_meta" size="95" />
-</directory>
+++ /dev/null
-<directory name="simple" rev="2" srcmd5="28fe7af7e9985507cf51196fc67015b7" vrev="2">
- <entry md5="7ba6ca74b292aaa5d46bc407ac5be166" mtime="1282060455" name="exists" size="7" />
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-<directory name="simple" rev="2" srcmd5="9247f30cd5694f5301965a0f20a2ed16" vrev="2">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282054323" name="upstream_added" size="23" />
-</directory>
+++ /dev/null
-This is a simple test.
+++ /dev/null
-<directory name="new">
-</directory>
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-This is a simple test.
+++ /dev/null
-<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-This is a simple test.
+++ /dev/null
-Is it
-possible to
-merge this file?
-I hope so...
+++ /dev/null
-<directory name="simple" rev="2" srcmd5="3ac41c59a5ed169d5ffef4d824700f7d" vrev="2">
- <entry md5="ff22941336956098ae9a564289d1bf1b" mtime="1282137256" name="added" size="15" />
- <entry md5="14758f1afd44c09b7992073ccf00b43d" mtime="1282137220" name="foo" size="7" />
- <entry md5="256d8f76ba7a0a231fb46a84866f25d8" mtime="1282137238" name="merge" size="20" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-xxx
-xxx
-yyy
-zzz
-zzz
+++ /dev/null
-another service
+++ /dev/null
-This is a file
-with a lot of
-text. Foo foo
-bar bar bar.
-foobarfoobar
+++ /dev/null
-<directory name="foo" rev="2" srcmd5="1c5d541a029694c43d5341cabcb4f40f" vrev="2">
- <entry md5="a0106bad78c9070662d5cde42ee35f23" mtime="1282564656" name="_service:bar" size="16" skipped="true" />
- <entry md5="d15dbfcb847653913855e21370d83af1" mtime="1282561867" name="_service:foo" size="6" skipped="true" />
- <entry md5="ed955c917012307d982b7cdd5799ff1a" mtime="1282320398" name="bigfile" size="69" />
- <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282320303" name="foo" size="23" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282320303" name="merge" size="48" />
-</directory>
+++ /dev/null
-<directory name="foo" rev="2" vrev="2" srcmd5="1c5d541a029694c43d5341cabcb4f40f">
- <entry name="_service:bar" md5="a0106bad78c9070662d5cde42ee35f23" size="16" mtime="1282564656" />
- <entry name="_service:foo" md5="d15dbfcb847653913855e21370d83af1" size="6" mtime="1282561867" />
- <entry name="bigfile" md5="ed955c917012307d982b7cdd5799ff1a" size="69" mtime="1282320398" />
- <entry name="foo" md5="0d62ceea6020d75154078a20d8c9f9ba" size="23" mtime="1282320303" />
- <entry name="merge" md5="17b9e9e1a032ed44e7a584dc6303ffa8" size="48" mtime="1282320303" />
-</directory>
+++ /dev/null
-<directory name="simple" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2">
- <entry md5="bb3a1efda68dff80ec3a2fb599b97ad8" mtime="1282058167" name="foo" size="39" />
- <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
- <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
-</directory>
+++ /dev/null
-<added>
-This is a simple test.
-<added>
projects / tools / osc.git / commitdiff