repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Removed todo item that is implemented :)
2007-05-17
S
i
m
o
n Hausmann
Re
m
oved todo it
e
m that is i
m
plemented
:)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Ad
d
ed support for
g
it
-
p4 sync/rebase --with-origin
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simo
n
H
a
usm
a
nn
Bite
t
he bull
e
t an
d
aut
o
m
a
t
ically co
n
vert old style
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simo
n
Hausmann
Changed the default
p4 import
branch to be refs/remote
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausman
n
Create the or
i
g
i
n
based impor
t
bra
n
c
h
us
i
ng git u
p
date
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
i
mon
Hausma
n
n
Removed ancie
n
t and
u
nu
s
e
d code to find the last imported
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Si
m
on Haus
m
ann
Removed cleantags command
.
It doesn't have any meaning
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Sim
o
n Hausmann
Clean up code duplication for revision parsing and
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Ha
u
smann
Always pass a sha1
f
or
t
h
e
i
nitial parent so
t
hat git
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hau
s
mann
Fixing syncing (gitdir discovery / cd)
f
or b
a
re reposi
t
or
i
es
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-16
Sim
o
n Hausmann
A
little todo note before I forget it :), b
a
sed on
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Sim
o
n Hausmann
Fix
calling git-p4 rebase from within
a subdire
c
tory
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon H
a
usmann
G
i
ve a be
t
ter
hint if gi
t
-
p
4
s
ubmit fail
s
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon
Haus
m
an
n
Add
e
d the poss
i
bility of skipping patches d
u
ring gi
t
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Ha
u
sma
n
n
M
a
k
e
git-p4 work wi
t
h
bare repositorie
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausm
a
n
n
Fix git-
p
4 clo
n
e
//d
e
pot/project (head
import)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Marius Storm-Ols
e
n
Mak
e
the command call sile
n
t
commit
|
commitdiff
|
tree
2007-05-15
Simon
H
ausmann
Converted to u
n
ix newlines
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simo
n
Hau
s
mann
Mak
e
sub
m
itt
i
ng
wo
r
k on Wind
o
ws
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausm
a
nn
Make sure all
popen c
a
l
l
s use bin
a
r
y
mode
(for
W
indows
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
S
i
m
on Hausmann
Add
e
d a
l
it
t
le
.
bat wrappe
r
from Mari
u
s
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon
Hausmann
Use the subprocess
m
o
d
ule
i
nstead of popen2
t
o make
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
Simon Hausmann
Document
some im
p
lementat
i
on details, for the c
u
rious
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Sim
o
n
H
a
u
smann
Cle
a
n
u
p, remove
d
the old ta
g
ging c
o
de
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hau
s
man
n
cleanu
p
, renamed
s
e
lf
.
globalPrefix to self
.
depo
t
Pat
h
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Si
m
on Hausmann
Mi
c
ro
clea
n
u
p
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simo
n
Hausmann
Doc cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simo
n
Hausmann
Handle patch errors in git-p
4
submit
better
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Hausmann
A new atte
m
p
t
at
fixing the child-fast-
i
mport-pro
c
e
s
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
S
i
m
o
n
Hausmann
Slightly improved f
o
r
m
a
t
t
i
ng of
the raw_
i
npu
t
qu
e
stions
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
S
i
mon
H
a
usmann
Removed th
e
old pa
t
c
h
apply
co
d
e
f
r
o
m
g
it-p4 submit
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon
Ha
u
smann
Fix
t
h
e
timezo
n
e
formatting
.
No
w
qgit
also d
i
splays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Simon Hausmann
Pr
i
nt an error message of so
m
e sort if git fas
t
-import
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
S
imon Hausmann
Allow for
c
o
n
v
enient
r
ebasi
n
g
a
f
ter git-p4 submi
t
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
imon Hausmann
A
dded a simple example of
usag
e
to the "document
a
ti
o
n
"
:)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
fix
v
ariable us
a
ge
(
oops)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simo
n
H
ausman
n
Fix file
de
t
e
rminati
o
n f
o
r #he
a
d imports
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Sim
o
n
Hausmann
Added git
-
p
4
c
l
one
c
onvenience command
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausma
n
n
H
o
nor --sile
n
t for labels
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon
H
ausmann
Turn
o
ff potentially slow lab
e
l detection by default
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
S
imon Hausmann
P
r
ovide a tree su
m
mary after gi
t
-p4 r
e
base
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
S
i
m
on
H
ausmann
A
d
d
ed git-p4 rebase convenience
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausmann
Cle
a
n u
p
p
ytho
n
class nam
e
s
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
S
i
mon
Hausmann
Fix "compilatio
n
"
:)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Si
m
on Hausma
n
n
Fix the d
o
cs for
git-p4 submit
a
nd turn git-p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simon Hau
s
mann
Fix
variab
l
e
u
sa
g
e i
n
t
a
g import
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hausmann
Ad
d
ed
s
upport fo
r
m
a
pping p4 labels to git t
a
gs
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hau
s
mann
g
i
t
-p4 debug
d
oesn't
need a git repository
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
S
i
m
on Hausman
n
Don
'
t try to parse any options with
g
it-p4 debug
b
ut
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausmann
P
refer gi
t
command over git-command
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausman
n
Minor cosm
e
t
i
c
fixl
e
t for th
e
git-p4 submit s
y
nc question
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Si
m
on
H
ausm
a
nn
Different versions of p4 have different output fo
r
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausmann
Use t
h
e new in
c
remental i
m
port
s
tyle
b
y defa
u
lt
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausm
a
nn
Make it p
o
ssible to run git-
p
4 submit from withi
n
the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Bran
d
new smart incr
e
me
n
tal import that
doesn't need
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Sim
o
n
H
au
s
mann
S
e
t the def
a
ult b
r
anch i
n
run
,
not in
the c
o
n
s
tructor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
H
e
lper function to c
h
eck the exis
t
anc
e
o
f
a
revision
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon Hausma
n
n
Added som
e
h
e
lper function(s) to parse the depot path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
imo
n
H
a
usmann
Chang
e
d the default bra
n
c
h
for imports from
"
maste
r
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Chan
g
ed the format of
t
he i
m
ported log message slightly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
H
ausmann
R
emov
e
d the
.
py extension from g
i
t-
p
4 as it's annoying
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausma
n
n
Don't s
h
ow
t
he submit t
e
mplate
and the di
f
f first in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Simo
n
Haus
m
ann
M
ake it possible to
i
nvoke git-p
4
from within
subdirec
t
ories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
i
m
on Ha
u
smann
Made --
a
pp
l
y
-as-patch the default f
o
r
g
it-
p
4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon H
a
usmann
Fix support
f
or
d
e
letions i
n
git-p4
s
ub
m
i
t
whe
n
usin
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
imon Haus
m
a
n
n
A
dded experiment
a
l but super-
f
ast --apply-a
s
-patch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausm
a
n
n
Do
c
u
m
e
ntation enhancements
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausman
n
S
t
a
r
t
o
f th
e
g
it-p4 do
c
umentation
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausm
a
nn
Removed p4-fast-export and
p
4
-
g
i
t-sync as they'
v
e
been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Haus
m
ann
Fixed
t
he initial
version impo
r
t by gettin
g
the file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Si
m
on Hausma
n
n
Ad
d
e
d missi
n
g "self"s t
o
make t
h
e
s
cript evaluate co
r
rectl
y
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Completely untested "merge" of
p
4
-fast-export
.
py
into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Si
m
on Hausmann
sync-to-pe
r
fo
r
ce
i
s now calle
d
submit
an
d
f
ixe
d
t
he
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Part of t
h
e code i
s
co
p
yrigh
t
by Trolltech ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausma
n
n
F
irst (untested) attempt at migrat
i
n
g
p
4-git-sync into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
imon Hausmann
P
r
ovide
a
lit
t
le bit
of help descri
p
tion for
th
e
g
it
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simo
n
H
a
u
s
m
a
n
n
Start mo
v
ing the git-p4
tools into one
single scr
i
pt
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Pass t
h
e right
number of argument
s
to commit, fixes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Improved the
g
it dir detectio
n
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simon H
a
usmann
Default
t
o intera
c
t
ive syncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simon H
a
us
m
ann
Use p4 revert
.
.
.
instead of revert
-
a
.
.
.
a
f
t
er sub
m
itt
i
ng
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Ha
u
sm
a
nn
A
ut
o
-detect the
c
urrent gi
t
br
a
nch
be
f
ore
s
ubmitting
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hau
s
mann
Ignore Apple reso
u
r
ce f
i
les when impor
t
ing from perforc
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Be
nice a
n
d use /usr/bin/env
python f
o
r the
g
it-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
S
i
mon
H
ausmann
Aut
o
matically operate on a
temporary
b
ranch, needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hau
s
m
a
nn
Lots of bugfixes to
p4-git-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hausmann
Fix git-dir o
p
t
i
on an
d
allow reading log
s
u
bstit
u
tions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon Ha
u
smann
First v
e
r
s
i
on of
a new scri
p
t t
o
su
b
mit changes back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
mon Hausmann
Split up the cache comma
n
dline opt
i
ons into
(
comma
n
d
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
H
ausma
n
n
Red
u
c
e
the n
u
mbe
r
o
f
fal
s
e "me
r
ge
s
" by skipping "branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Sim
o
n Haus
m
ann
More work on branch detec
t
ion by
i
m
plement
i
ng changeIsBranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausma
n
n
Mo
r
e
c
ode c
l
eanup
s
an
d
pr
e
p
a
rations for mor
e
bran
c
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausm
a
nn
Minor code clea
n
ups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausman
n
Make the p4 data/c
o
mmand ca
c
h
e
configur
a
b
le
through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
S
i
mon Ha
u
smann
Fixed p4-deb
u
g
file extensio
n
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausma
n
n
Change
d
--k
n
own-branches to
t
ake a file as argument
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Simon Ha
u
s
mann
Work in progr
e
ss on dete
c
ting
branches
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Simon H
a
usm
a
nn
A
d
just the output parsin
g
of
g
i
t
n
a
me-rev
to handle
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hau
s
mann
Don't print a plain newline at the end of the
ex
e
cution
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
S
i
mo
n
Hausmann
More work in --silent support
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
next