mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-14 00:06:15 +01:00
Code

fix whitespace

Browse Source
This commit is contained in:
Pavol Rusnak 2010-02-28 02:30:13 +01:00
parent 22b684fa38
commit 8d551e0a69
13 changed files with 149 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
PROJ_PACK.txt
View File

@ -1,4 +1,4 @@
jw, Tue Oct 20 22:09:16 CEST 2009 jw, Tue Oct 20 22:09:16 CEST 2009
This is a feature suggestion for easier osc commandline handling. This is a feature suggestion for easier osc commandline handling.
Many commands require specifying Project and/or Package names. Many commands require specifying Project and/or Package names.
@ -12,19 +12,19 @@ The current situation is not satisfying for the following reasons:
Examples as of osc version 0.123: Examples as of osc version 0.123:
osc maintainer PRJ [PKG] osc maintainer PRJ [PKG]
- does not look in the current directory. - does not look in the current directory.
- need at least PRJ. - need at least PRJ.
osc list [PRJ [PKG]] osc list [PRJ [PKG]]
- Never looks at the current directory. - Never looks at the current directory.
- lists all projects, if run without parameters. - lists all projects, if run without parameters.
osc checkout [PRJ] PKG osc checkout [PRJ] PKG
osc checkout PRJ osc checkout PRJ
- takes project from current directory, if inside a checkout tree - takes project from current directory, if inside a checkout tree
- else operates on an entire project. - else operates on an entire project.
osc checkin [ARG] osc checkin [ARG]
- defaults to current project and package, - defaults to current project and package,
- if arg is a subdirectory, project is taken from current directory - if arg is a subdirectory, project is taken from current directory
- if arg is a file, both project and package are taken from current - if arg is a file, both project and package are taken from current
directory. directory.
osc results [PRJ PKG] osc results [PRJ PKG]
- takes either both or none from current directory. - takes either both or none from current directory.
- many commands do not look into the current directory, - many commands do not look into the current directory,
@ -53,22 +53,22 @@ osc shall support aliases, to save typing. Some implicit aliases exist,
with well defined magic effects. Aliases substitution is literal. with well defined magic effects. Aliases substitution is literal.
They can replace options including their parameters, or just the option, or They can replace options including their parameters, or just the option, or
just the parameters. just the parameters.
- (a dash) expands to --prj openSUSE:Factory - (a dash) expands to --prj openSUSE:Factory
(or --prj followed by any other project as defined in (or --prj followed by any other project as defined in
~/.oscrc:default_project ) ~/.oscrc:default_project )
--prj - is synonymous to just -, for consistency. --prj - is synonymous to just -, for consistency.
. (a dot) evaluates the current working directory, searching for . (a dot) evaluates the current working directory, searching for
.osc/_apiurl, .osc/_project, and .osc/_package .osc/_apiurl, .osc/_project, and .osc/_package
Implicit --apiurl, --prj, or --pkg options are constructed as far Implicit --apiurl, --prj, or --pkg options are constructed as far
as available from the current directory and as far as not already as available from the current directory and as far as not already
present in the command line. present in the command line.
If a dot is used as parameter to an option, it has a more If a dot is used as parameter to an option, it has a more
deterministic meaning. deterministic meaning.
--apiurl . Substitute only the current apiurl, --apiurl . Substitute only the current apiurl,
--prj . Substitute the current project name, and provides --prj . Substitute the current project name, and provides
a default for --apiurl unless given. a default for --apiurl unless given.
--pkg . Substitures current package name likewise. --pkg . Substitures current package name likewise.
./. expands to --prj . --pkg . ./. expands to --prj . --pkg .
./PKG expands to --prj . --pkg PKG ./PKG expands to --prj . --pkg PKG
@ -83,10 +83,10 @@ printed as debug output.
online help of osc commands shall refer to the above syntax like this: online help of osc commands shall refer to the above syntax like this:
osc CMD ... PROJ/PACK osc CMD ... PROJ/PACK
An additional help entry An additional help entry
osc help 'PROJ/PACK' osc help 'PROJ/PACK'
shall explain the relevant details as presented herein. shall explain the relevant details as presented herein.

33
README
View File

@ -14,10 +14,11 @@ RPM packages are here (rpm-md repository):
http://download.opensuse.org/repositories/openSUSE:/Tools/ http://download.opensuse.org/repositories/openSUSE:/Tools/
To install from svn, do To install from svn, do
python setup.py build
python setup.py install python setup.py build
# create a symlink 'osc' in your path pointing to osc.py. python setup.py install
ln -s osc-wrapper.py /usr/bin/osc # create a symlink 'osc' in your path pointing to osc.py.
ln -s osc-wrapper.py /usr/bin/osc
Alternatively, you can directly use osc-wrapper.py from the source dir Alternatively, you can directly use osc-wrapper.py from the source dir
(which is easier if you develop on osc). (which is easier if you develop on osc).
@ -132,21 +133,21 @@ USAGE EXAMPLES:
(online at http://en.opensuse.org/Build_Service/CLI ) (online at http://en.opensuse.org/Build_Service/CLI )
To list existing content on the server To list existing content on the server
osc ls # list projects osc ls # list projects
osc ls Apache # list packages in a project osc ls Apache # list packages in a project
osc ls Apache subversion # list files of package of a project osc ls Apache subversion # list files of package of a project
Check out content Check out content
osc co Apache # entire project osc co Apache # entire project
osc co Apache subversion # a package osc co Apache subversion # a package
osc co Apache subversion foo # single file osc co Apache subversion foo # single file
Update a working copy Update a working copy
osc up osc up
osc up [pac_dir] # update a single package by its path osc up [pac_dir] # update a single package by its path
osc up * # from within a project dir, update all packages osc up * # from within a project dir, update all packages
osc up # from within a project dir, update all packages osc up # from within a project dir, update all packages
AND check out all newly added packages # AND check out all newly added packages
If an update can't be merged automatically, a file is in 'C' (conflict) If an update can't be merged automatically, a file is in 'C' (conflict)
state, and conflicts are marked with special <<<<<<< and >>>>>>> lines. state, and conflicts are marked with special <<<<<<< and >>>>>>> lines.
@ -154,7 +155,7 @@ After manually resolving the problem, use
osc resolved foo osc resolved foo
Upload change content Upload change content
osc ci # current dir osc ci # current dir
osc ci <dir> osc ci <dir>
osc ci file1 file2 ... osc ci file1 file2 ...
@ -171,7 +172,7 @@ Adds all new files in local copy and removes all disappeared files.
osc addremove osc addremove
Generates a diff, to view the changes Generates a diff, to view the changes
osc diff # current dir osc diff # current dir
osc diff file1 file2 ... osc diff file1 file2 ...
Shows the build results of the package Shows the build results of the package