repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Create the origin based import branch using git update-ref instead of git branch
2007-05-17
S
imon Hausmann
C
reat
e
the origin based
import
b
r
anch using
g
it u
p
date
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
i
m
on Ha
u
smann
R
e
mov
e
d
a
n
c
ient and
u
nused code to find the last imported
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Si
m
on Ha
u
smann
Removed
cleantags command
.
It d
o
esn't have any
m
eaning
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon
H
au
s
ma
n
n
C
lea
n
up code
duplicat
i
on for
r
evision
p
arsing and
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Sim
o
n Hausmann
A
l
ways
p
ass a
sha1
for
t
he initial parent so that git
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Ha
u
smann
F
ixing
syncing
(
gi
t
dir discovery / cd)
f
o
r
b
are repositories
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
A
l
ittle to
d
o n
o
te before I forget it :
)
,
based
o
n
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
Fix calling git-p4 rebas
e
f
rom within
a
sub
d
irector
y
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Si
m
on
H
ausmann
Give
a better hint if git-p4 submit
f
a
ils
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Sim
o
n Hausmann
Added
t
he possibi
l
ity of ski
p
ping patches during g
i
t
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
S
imon Hausmann
Make git-p4 work with ba
r
e
reposi
t
orie
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-15
S
i
mon Hausmann
Fix git-p4 clone //depot/proj
e
ct (head import)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simo
n
Hausm
a
nn
Converted to unix
newlines
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Si
m
o
n
Haus
m
an
n
Make submitting work
on Wind
o
ws
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon
H
ausmann
Make sure
a
ll popen cal
l
s use
b
i
n
a
r
y mode (for Windows
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
S
i
mon Hausm
a
nn
Ad
d
ed
a little
.
bat wr
a
pper
f
r
om Marius
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
U
se t
h
e sub
p
rocess module instead of popen2
t
o mak
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
Simon Hausman
n
D
o
cument some implementation details, for the curi
o
us
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
Cleanup, removed th
e
old ta
g
ging c
o
de
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon H
a
usm
a
nn
cl
e
anup, re
n
amed self
.
globalPr
e
fix to
self
.
depotPath
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Ha
u
smann
Micr
o
c
l
eanup
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausm
a
nn
Doc cleanup
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Hausma
n
n
Hand
l
e pat
c
h er
r
ors
in git-p4 su
b
mit better
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon
Hausmann
A new attem
p
t at fixin
g
the child-
f
ast-
i
mport-pr
o
cess
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausmann
Slightly improved fo
r
matting
of
the raw_input quest
i
ons
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon
Hau
s
mann
Removed the o
l
d patch a
p
ply code
f
rom git-p4 submit
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Si
m
on Hausmann
Fix the
t
im
e
zone formatting
.
Now qgit also dis
p
lays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Simo
n
Hau
s
mann
Print an er
r
o
r messa
g
e
of some
so
r
t i
f
git fa
s
t-import
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
S
imon Hausmann
Allow for convenient rebasing
a
fter git
-
p4 s
u
bmit
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon
H
ausmann
Added a simple examp
l
e of usage to the "d
o
cu
m
ent
a
tion" :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Si
m
on Haus
m
ann
fix varia
b
l
e usage (oops)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Haus
m
ann
Fix file
d
e
terminati
o
n
f
o
r #head imports
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausman
n
Added git-p4 cl
o
ne c
o
nveni
e
nce command
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
i
m
on Hausmann
Honor --silen
t
for labels
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simo
n
Hausma
n
n
Turn off potentiall
y
slo
w
label detect
i
on by de
f
ault
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Sim
o
n H
a
usmann
Provide a tree summary after git-p4 rebase
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simo
n
Hausmann
Added git-p4
rebase conveni
e
nce
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
S
imon Hausmann
Clea
n
up python cl
a
ss names
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Simon Haus
m
an
n
Fix "compila
t
ion" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Simon
Hausmann
Fix the docs f
o
r git-p4 s
u
bmi
t
an
d
turn
g
it-
p
4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simo
n
H
a
usmann
Fix variable usa
g
e in t
a
g import
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Haus
m
ann
Adde
d
sup
p
o
r
t
for mapping p4 labels to git tags
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hausmann
git
-
p4 debu
g
d
o
e
sn't need a git re
p
osito
r
y
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Simon Hau
s
ma
n
n
Don't try t
o
parse any options with git-p
4
debug b
u
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
S
i
mon Hausmann
P
refer
g
it c
o
mmand over git-comma
n
d
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausman
n
M
inor cosmetic fixlet for
t
he git-p4 subm
i
t sync question
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
S
imon
Ha
u
s
m
a
n
n
Diff
e
re
n
t ve
r
sions of p4 have different o
u
tp
u
t for
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simo
n
Hau
s
mann
Use the new
increment
a
l impor
t
s
tyle by default
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hau
s
ma
n
n
Ma
k
e it pos
s
ible to run git-
p
4 submit f
r
om within the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
S
imon Hausmann
B
r
and ne
w
s
m
a
r
t incremental import tha
t
doesn't n
e
e
d
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Ha
u
smann
Set
the
defa
u
lt branch in ru
n
, n
o
t in the construct
o
r
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
imon Hau
s
mann
Helper function to check the exi
s
tance of
a revisi
o
n
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon H
a
usmann
Added some
helper function(s)
to pa
r
se t
h
e depot path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Changed th
e
def
a
u
l
t branc
h
for imports from
"ma
s
ter
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
m
o
n
Hausmann
Chan
g
ed the format of the i
m
por
t
ed log messa
g
e sl
i
ghtly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Removed the
.
py
extension from git-p4 as it's annoying
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Sim
o
n Ha
u
sma
n
n
D
o
n't show
the s
u
bmi
t
template an
d
th
e
diff first i
n
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausma
n
n
Make it possible
to inv
o
k
e
g
i
t-p4 from
w
ithin subdirectories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Haus
m
ann
Made --apply-as-patch the def
a
ult f
o
r git-p4
s
ub
m
it
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon
Ha
u
smann
Fix support for delet
i
o
n
s
in git-p4
s
ubmit when using
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
imon
H
a
usma
n
n
A
d
de
d
e
x
peri
m
enta
l
but super-fast --apply
-
as-pa
t
ch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
imon Hausm
a
n
n
Documentation enh
a
ncements
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Start of
the git-p4 docume
n
tation
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausma
n
n
R
e
moved p4-fast-exp
o
rt and p4
-
git-syn
c
as they've been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Fixed the initial version import by g
e
tting the
file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
imon
H
ausmann
A
d
ded miss
i
ng "sel
f
"s to m
a
ke
the s
c
ri
p
t
eval
u
at
e
corre
c
tly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
imon
Hau
s
mann
Comple
t
el
y
unt
e
st
e
d "me
r
ge" of p4-fast-
e
x
p
ort
.
py i
n
to
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Sim
o
n Ha
u
sman
n
sync-
t
o-
p
erforce i
s
n
o
w called submit and fixed
t
he
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
imon Hausma
n
n
P
ar
t
o
f
t
he c
o
de i
s
copyri
g
ht by Trol
l
tech ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Ha
u
smann
First (untested) atte
m
pt at
migr
a
ting p4-git
-
sync
into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
i
m
on Hausma
n
n
P
r
ovide
a
l
i
ttle bit o
f
h
e
lp description for the git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
i
mon
H
ausmann
Start
m
oving the
g
it-
p
4 tool
s
into
o
ne singl
e
script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
imon Hausmann
Pass the
ri
g
ht nu
m
ber of argum
e
n
t
s to
co
m
mit, fi
x
es
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simo
n
Hausmann
Improved the git
d
i
r
d
e
tec
t
ion
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Sim
o
n Hausmann
Default to interactive sync
i
ng
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
S
imon Hausmann
Use
p
4 revert
.
.
.
instead of r
e
vert -a
.
.
.
after submitting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Auto-
d
etect t
h
e
c
urrent git
branch before submitting
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon
H
ausmann
Ig
n
or
e
Appl
e
r
esou
r
ce files
w
he
n
impo
r
t
ing from
p
erforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
S
imo
n
Hausmann
Be nice a
n
d use /u
s
r/bin/env python for the git-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausma
n
n
Automatical
l
y
ope
r
ate
on a t
e
mporary bran
c
h
,
neede
d
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon
H
ausmann
Lots of bugfixes to p4
-
git-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Sim
o
n Hausmann
F
i
x
git-dir option and al
l
ow reading log
s
u
bstitution
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon Ha
u
smann
First versi
o
n
of a new
s
cr
i
pt to submit changes back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
imon H
a
usm
a
n
n
Spl
i
t up the
c
ache commandline option
s
into (command
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
m
on Ha
u
smann
Reduce th
e
nu
m
ber of false
"
m
erges" by skipp
i
n
g
"branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
More work on bra
n
ch detect
i
on by impl
e
menting c
h
angeIsBran
c
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
imon
H
ausma
n
n
M
o
re code clea
n
ups
and preparat
i
ons f
o
r
m
o
re br
a
nc
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Minor co
d
e
c
leanups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
on Hausmann
Make the p4 d
a
ta/com
m
and cach
e
configu
r
able t
h
roug
h
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
on Hausmann
Fixed p
4
-
d
e
bug file e
x
tension
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Si
m
on Haus
m
a
n
n
Changed --kno
w
n-branches t
o
take a file as a
r
gu
m
en
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
S
imon Hausmann
Work
in progress o
n
detecting branches
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Simon Haus
m
ann
A
d
j
u
s
t th
e
o
u
tput parsin
g
of git name-rev to
h
andle
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hau
s
ma
n
n
Don't pr
i
nt
a p
l
ai
n
n
e
wline a
t
the end of t
h
e execution
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Simon
Ha
u
smann
More work i
n
--si
l
e
nt support
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon
H
ausmann
A
dded support for --silent so that p
4
-fast-export can
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
Simo
n
Hausman
n
Adde
d
p
4
d
e
lete behavi
o
ural emu
l
ation as todo ite
m
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
S
i
m
o
n Hausmann
F
ix sing
l
e-branch imports b
y
ski
p
p
ing the b
r
a
nc
h
/merge
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Si
m
on
H
ausmann
U
s
e sets
.
S
et
(
) instead of set() to
r
un
a
lso with older
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon
H
ausmann
Ma
k
e
i
t po
s
sible to specify the p4 change
s
to import
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
next